From 5d6e797a6b0d55e9e5451fabc613ef6d9d14180e Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sun, 4 May 2008 15:36:23 +0300
Subject: [PATCH] Maintain SUBDIRS manually for extra flexibility

---
 modules/access/Modules.am        | 1 +
 modules/audio_filter/Modules.am  | 1 +
 modules/codec/Modules.am         | 1 +
 modules/control/Modules.am       | 1 +
 modules/demux/Modules.am         | 1 +
 modules/genmf                    | 3 ---
 modules/gui/Modules.am           | 1 +
 modules/misc/Modules.am          | 1 +
 modules/mux/Modules.am           | 1 +
 modules/stream_out/Modules.am    | 1 +
 modules/video_filter/Modules.am  | 1 +
 modules/video_output/Modules.am  | 1 +
 modules/visualization/Modules.am | 1 +
 13 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index bc94468ffd..5d76ae05f5 100644
--- 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 fa3dc4f6f0..eade69d939 100644
--- 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 a5d977a431..f790127a32 100644
--- 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 c982b05d77..406618e027 100644
--- 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 ce7796f8b6..d153440784 100644
--- 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 be104529f3..4969410018 100755
--- 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 dc3b93cc59..d596a160aa 100644
--- 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 961cec1d94..2cc97d3884 100644
--- 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 eef5fcd7ea..2f5bf413ee 100644
--- 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 6df275351f..961f7e8945 100644
--- 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 0907700df0..06408eaafe 100644
--- 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 49c495449b..f73cf65c4f 100644
--- 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 f075156ec8..eb987fb9e6 100644
--- a/modules/visualization/Modules.am
+++ b/modules/visualization/Modules.am
@@ -1 +1,2 @@
+SUBDIRS = visual galaktos
 SOURCES_goom = goom.c
-- 
2.39.2