Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index bee6653f74077eddfcd25bfa2aed637b2f334080..6a1703fb0bf4e0bf170a60a2cad6918b4629cee4 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,6 +1,6 @@
+NULL =
 BASE_SUBDIRS = \
        access \
-       access_filter \
        audio_filter \
        audio_mixer \
        audio_output \
@@ -20,13 +20,56 @@ BASE_SUBDIRS = \
 EXTRA_SUBDIRS = \
        access_output \
        mux \
-       stream_out
+       stream_out \
+       mmx \
+       mmxext \
+       sse2 \
+       3dnow \
+       altivec \
+       arm_neon \
+       $(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
+if HAVE_MMX
+SUBDIRS += mmx
+endif
+if HAVE_MMXEXT
+SUBDIRS += mmxext
+endif
+if HAVE_SSE2
+SUBDIRS += sse2
+endif
+if HAVE_3DNOW
+SUBDIRS += 3dnow
+endif
+if HAVE_ALTIVEC
+SUBDIRS += altivec
+endif
+if HAVE_ARM_NEON
+SUBDIRS += arm_neon
+endif
+SUBDIRS += .
 
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST
+MOSTLYCLEANFILES = 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
+
+install-exec-hook:
+       if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
+               ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
+       else \
+               echo "Staged installation: cache generation skipped!" ; \
+       fi