X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=86d7f65596e39a5e12f8fe22340af8f4612fb570;hb=9b4e85b66d40b94678ddbec2d9ea25e4a6625191;hp=85b8a8b5708c489983e062a92128c9afa114ce8b;hpb=e7df8e75ea9ccd8450f88acadbc238a2c0285790;p=vlc

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 85b8a8b570..86d7f65596 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,6 +2,7 @@
 #
 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
@@ -22,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
@@ -31,9 +32,8 @@ endif
 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
-vlc_DEPENDENCIES = ../src/libvlc.sym
 vlc_LDFLAGS = $(LDFLAGS_vlc)
-vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
+vlc_LDADD = ../lib/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -46,7 +46,7 @@ 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
@@ -63,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