Revert "win64: enable live again"

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 0a44120629529036d33fc413e62757ae6ac70472..86d7f65596e39a5e12f8fe22340af8f4612fb570 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,13 +2,15 @@
 #
 bin_PROGRAMS = vlc
 noinst_PROGRAMS = vlc-static
+noinst_DATA =
 vlclib_PROGRAMS = vlc-cache-gen
 EXTRA_PROGRAMS = vlc-wrapper
 EXTRA_DIST = vlc_win32_rc.rc.in
 
 SUFFIXES = .rc.in .rc
 
-AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+AM_CPPFLAGS = $(CPPFLAGS_vlc)
+AM_CFLAGS = $(CFLAGS_vlc)
 
 
 if !HAVE_WIN32
@@ -21,7 +23,7 @@ endif
 EXTRA_vlc_SOURCES = vlc.c winvlc.c
 if HAVE_WIN32
 vlc_SOURCES = winvlc.c
-noinst_DATA = vlc_win32_rc.rc
+noinst_DATA += vlc_win32_rc.rc
 endif
 if HAVE_WINCE
 vlc_SOURCES = winvlc.c
@@ -30,9 +32,8 @@ endif
 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
-vlc_DEPENDENCIES = ../src/libvlc.sym
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la `$(VLC_CONFIG) -libs vlc`
+vlc_LDFLAGS = $(LDFLAGS_vlc)
+vlc_LDADD = ../lib/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -41,13 +42,14 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
        $(NULL)
 vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
-vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
+vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
 if HAVE_WIN32
 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
-vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
+vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
 else
 vlc_LDADD += $(LIBDL)
+vlc_static_LDFLAGS += -no-install -static
 endif
 
 vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
@@ -61,9 +63,24 @@ vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
        $(GNUGETOPT_LIBS) \
        ../compat/libcompat.la \
-       ../src/libvlc.la ../src/libvlccore.la
+       ../lib/libvlc.la ../src/libvlccore.la
 if HAVE_WIN32
 vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
 vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
 endif
 
+#
+# Plug-ins cache
+#
+noinst_DATA += ../modules/plugins.dat
+MOSTLYCLEANFILES = $(noinst_DATA)
+
+.PHONY: ../modules/plugins.dat
+
+../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
+       $(AM_V_at)rm -f ../modules/plugins.dat
+       $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
+               ./vlc-cache-gen$(EXEEXT) ../modules ; \
+       else \
+               echo "Cross-compilation: cache generation skipped!" ; \
+       fi