Define HAVE_V4L2 conditional

[vlc] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 6a1703fb0bf4e0bf170a60a2cad6918b4629cee4..f739ecc88f520fbd50cf06c94bb178bd3846978c 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -10,9 +10,12 @@ BASE_SUBDIRS = \
        gui \
        meta_engine \
        misc \
+       media_library \
+       notify \
        packetizer \
        services_discovery \
        stream_filter \
+       text_renderer \
        video_chroma \
        video_filter \
        video_output \
@@ -27,6 +30,7 @@ EXTRA_SUBDIRS = \
        3dnow \
        altivec \
        arm_neon \
+       lua \
        $(NULL)
 
 SUBDIRS = $(BASE_SUBDIRS)
@@ -49,14 +53,17 @@ endif
 if HAVE_ALTIVEC
 SUBDIRS += altivec
 endif
-if HAVE_ARM_NEON
+if HAVE_NEON
 SUBDIRS += arm_neon
 endif
+if BUILD_LUA
+SUBDIRS += lua
+endif
 SUBDIRS += .
 
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST
-MOSTLYCLEANFILES = plugins-*-*.dat
+MOSTLYCLEANFILES = plugins.dat*
 
 .PHONY: stamp-cache
 
@@ -69,7 +76,9 @@ stamp-cache:
 
 install-exec-hook:
        if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
-               ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
+               LD_LIBRARY_PATH="$(libdir)" \
+               "$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+                        "$(vlclibdir)/plugins" ; \
        else \
                echo "Staged installation: cache generation skipped!" ; \
        fi