[vlc-devel] commit: Try to generate the plugins cache from make ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Jan 25 21:42:04 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jan 25 22:26:07 2010 +0200| [a1f89b24212225dce7da32aeaee64772926b5e20] | committer: Rémi Denis-Courmont 

Try to generate the plugins cache from make

 * Generate the plugins cache for the build tree during make all
   (if not cross-compiling).
 * Generate the plugins cache for the installation during make install
   (if not staging with DESTDIR).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1f89b24212225dce7da32aeaee64772926b5e20
---

 modules/Makefile.am |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index e533432..bb5cf0f 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_SUBDIRS = \
 	$(NULL)
 
 SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) .
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
@@ -52,6 +52,26 @@ endif
 if HAVE_ARM_NEON
 SUBDIRS += arm_neon
 endif
+SUBDIRS += .
 
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST
+noinst_DATA = stamp-cache
+MOSTLYCLEANFILES = stamp-cache plugins-*-*.dat
+
+.PHONY: stamp-cache
+
+stamp-cache:
+	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
+		../bin/vlc-cache-gen$(EXEEXT) . ; \
+	else \
+		echo "Cross-compilation: cache generation skipped!" ; \
+	fi
+	$(AM_V_at)touch stamp-cache
+
+install-exec-hook:
+	if test -z "$(DESTDIR)"; then \
+		cd "$(vlclibdir)" && ./vlc-cache-gen . ; \
+	else \
+		echo "Staged installation: cache generation skipped!" ; \
+	fi




More information about the vlc-devel mailing list