Build modules before libvlc and VLC

The largest change here consists of building the plug-ins cache after
vlc-cache-gen (instead of after modules previously).

diff --git a/Makefile.am b/Makefile.am
index a415dd106f1e2348364b8a6f3298d9635a6e20f2..e2815c4e2236d27b89bb7b1fa2a0bd361dbc645c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,11 @@
 #  - src (libvlc) is nedeed by modules
 #  - libs/* are needed by modules
 DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
-SUBDIRS = compat doc po share src lib
+SUBDIRS = compat doc po share src modules lib
 if BUILD_VLC
 SUBDIRS += bin
 endif
-SUBDIRS += modules test
+SUBDIRS += test
 
 EXTRA_DIST = \
        HACKING \

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7c40a971b19931add70af65d73ccf6f35a786166..06c5d3b4f03b01d91aaa84806407a022db687e94 100644 (file)
--- 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
@@ -68,3 +69,27 @@ 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
+
+install-exec-hook:
+       if test "$(build)" = "$(host)"; then \
+               LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
+               "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+                        "$(DESTDIR)$(vlclibdir)/plugins" ; \
+       else \
+               echo "Cross-compilation: cache generation skipped!" ; \
+       fi

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 9205ea26ecab0975a22a7d8a5a425fd89483426b..68df599b90fb230657b3260df846820002f623b1 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -63,24 +63,3 @@ SUBDIRS += .
 
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST
-noinst_DATA = plugins.dat
-MOSTLYCLEANFILES = $(noinst_DATA)
-
-.PHONY: plugins.dat
-
-plugins.dat:
-       $(AM_V_at)rm -f plugins.dat
-       $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
-               ../bin/vlc-cache-gen$(EXEEXT) . ; \
-       else \
-               echo "Cross-compilation: cache generation skipped!" ; \
-       fi
-
-install-exec-hook:
-       if test "$(build)" = "$(host)"; then \
-               LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
-               "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-                        "$(DESTDIR)$(vlclibdir)/plugins" ; \
-       else \
-               echo "Cross-compilation: cache generation skipped!" ; \
-       fi