Do not wander twice in the same subdir - fix distcheck

diff --git a/Makefile.am b/Makefile.am
index 8d5047c75ed9160639d92ad2ef0035fa701fac4a..b494117011127bf0a3d68892161b882ede5ccc0f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,12 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
+BASE_SUBDIRS = po src modules share doc test
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
        bindings/python \
        libs/loader libs/srtp \
        projects/mozilla projects/activex
-DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 SUBDIRS = po src
 if LOADER

diff --git a/modules/Makefile.am b/modules/Makefile.am
index d532b4a75ec4432a1c26b95b98daf46309ea0b41..1a2ad33fb36a9e4c966bd98dc9a93ff3f1447890 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = \
+BASE_SUBDIRS = \
        access \
        access_filter \
        audio_filter \
@@ -20,11 +20,12 @@ EXTRA_SUBDIRS = \
        access_output \
        mux \
        stream_out
+
+SUBDIRS = $(BASE_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
 
-DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
-
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 349bd6da11f1d5cdc3c6f30d7034f232d79967a3..6cc515d3e0e43972d1cc33b05ae906a4ab58478e 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,9 +3,10 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
+BASE_SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
 EXTRA_SUBDIRS = bda dshow
-SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
-DIST_SUBDIRS = $(EXTRA_SUBDIRS) $(SUBDIRS)
+SUBDIRS = $(BASE_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 if HAVE_WIN32
 SUBDIRS += bda dshow

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 4cbd0136607417ebffe917f2aac092e520c8f5e0..6795ea9d2eb5cd2b1749eeb26e25761cd78faa08 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,5 +1,8 @@
-SUBDIRS = dummy memcpy notify testsuite playlist osd xml probe
-DIST_SUBDIRS = lua $(SUBDIRS)
+BASE_SUBDIRS = dummy memcpy notify testsuite playlist osd xml probe
+EXTRA_SUBDIRS = lua
+
+SUBDIRS = $(BASE_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 if BUILD_LUA
 SUBDIRS += lua