Maintain SUBDIRS manually for extra flexibility

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index bc94468ffde884831cdaaf3b614647fbf99fe1fd..5d76ae05f5ff154f33ceda69f56ac25f2cd0084e 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = bda dshow dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreover Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.

diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
index fa3dc4f6f04dfe91f87100374c53b3295111a7a3..eade69d9390cab92688628c989766cff11114c9a 100644 (file)
--- a/modules/audio_filter/Modules.am
+++ b/modules/audio_filter/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = channel_mixer converter resampler spatializer
 SOURCES_equalizer = equalizer.c equalizer_presets.h
 SOURCES_normvol = normvol.c
 SOURCES_audio_format = format.c

diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index a5d977a4314d774e7d2d8337a4a823c0cd30a32c..f790127a329a10814ea85fce6d2434e5cec9e7a7 100644 (file)
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = cmml dmo ffmpeg subtitles spudec xvmc
 # Disabled modules
 SOURCES_a52 = a52.c
 SOURCES_cinepak = cinepak.c

diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index c982b05d77dab9c263270035d1400e6671e823b2..406618e0276d05191a884a3603f80a5a007dffe7 100644 (file)
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = http
 SOURCES_gestures = gestures.c
 SOURCES_showintf = showintf.c
 SOURCES_telnet = telnet.c

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index ce7796f8b66da81e6c11a70846dde35d8619ec37..d1534407847c7dabced88784741f817cf926b46a 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = asf avi mp4 mpeg playlist
 SOURCES_a52sys = a52.c
 SOURCES_dtssys = dts.c
 SOURCES_flacsys = flac.c

diff --git a/modules/genmf b/modules/genmf
index be104529f31ff51ddf32c4fcb0a5cffaad95493d..4969410018bf87ff260c15fce843d3928d1fbc86 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -16,8 +16,6 @@ do
   modf="modules/${dir}/Modules.am"
   makf="modules/${dir}/Makefile.am"
   basedir="`echo "${dir}" | cut -f1 -d/`"
-  # automake will not recurse for make dist if we don't define SUBDIRS = .
-  subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
   mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | sort | uniq | xargs`"
   plugins="`sed -n -e 's/^.*lib\([^ ]*\)_plugin\.la.*/\1/p' < "${modf}" | sort | uniq | xargs`"
   libvlc_ltlibs=""
@@ -40,7 +38,6 @@ do
 basedir = ${basedir}
 dir = ${dir}
 mods = ${mods}
-SUBDIRS = ${subdirs}
 libvlc_LTLIBRARIES = ${libvlc_ltlibs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
 

diff --git a/modules/gui/Modules.am b/modules/gui/Modules.am
index dc3b93cc590b11ab22157de215eb3d8ba0087b81..d596a160aa6e9abcfc3d9dfc887b5ce5db77c3e5 100644 (file)
--- a/modules/gui/Modules.am
+++ b/modules/gui/Modules.am
@@ -1,2 +1,3 @@
+SUBDIRS = beos pda macosx minimal_macosx qnx qt4 skins2 wxwidgets wince
 SOURCES_ncurses = ncurses.c
 SOURCES_fbosd = fbosd.c

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 961cec1d94b509449f046fd91a3caab40ecfd5de..2cc97d3884d2c978b32b1ff820ac62b088b83c24 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = dummy lua memcpy notify testsuite playlist osd xml probe
 SOURCES_gtk_main = gtk_main.c
 SOURCES_gnome_main = gtk_main.c
 SOURCES_gtk2_main = gtk_main.c

diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index eef5fcd7ea7a18988e77aa3e52576c988bab3ce1..2f5bf413eed9f6d54c9af7128543b2c149a315f7 100644 (file)
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = mpeg rtp
 SOURCES_mux_dummy = dummy.c
 SOURCES_mux_avi = avi.c
 SOURCES_mux_ogg = ogg.c

diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 6df275351f824cb326745041c1e4bba34e16d4f2..961f7e89452939d4f5f33ab90a9d2411ca8787fb 100644 (file)
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = transrate
 SOURCES_stream_out_dummy = dummy.c
 SOURCES_stream_out_description = description.c
 SOURCES_stream_out_standard = standard.c

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 0907700df0587d9d2dfc10e1cc7fbfa22145e4f9..06408eaafe793b81d73bfa74eaa117c65719e145 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = atmo dynamicoverlay
 SOURCES_mosaic = mosaic.c mosaic.h
 SOURCES_transform = transform.c
 SOURCES_invert = invert.c

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 49c495449b364d9a943c6bcdf03d3c27d85eebe6..f73cf65c4fe1a72ce4948002b7ab72858e629d3a 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,3 +1,4 @@
+SUBDIRS = msw qte x11
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreocer Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.

diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am
index f075156ec87687de74d13ae71ea00f579229ffc4..eb987fb9e6757779ab95238169bc9a4dbd383550 100644 (file)
--- a/modules/visualization/Modules.am
+++ b/modules/visualization/Modules.am
@@ -1 +1,2 @@
+SUBDIRS = visual galaktos
 SOURCES_goom = goom.c