[vlc-devel] commit: Do not wander twice in the same subdir - fix distcheck ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat May 10 20:16:58 2008 +0300| [7690e538aa8ad75a872bd0235f528d2d8f54675f]

Do not wander twice in the same subdir - fix distcheck

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

 Makefile.am               |    3 ++-
 modules/Makefile.am       |    7 ++++---
 modules/access/Modules.am |    5 +++--
 modules/misc/Modules.am   |    7 +++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8d5047c..b494117 100644
--- 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 d532b4a..1a2ad33 100644
--- 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 349bd6d..6cc515d 100644
--- 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 4cbd013..6795ea9 100644
--- 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