[vlc-devel] commit: Check-in modules/Makefile.am ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sun Mar 23 21:53:10 2008 +0200| [fa9abba62f600b1c019da926c5ed1c6752f80fb5]

Check-in modules/Makefile.am

It was a bit clumsy to have to modify it through bootstrap.

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

 bootstrap                                   |    8 --------
 modules/Makefile.am                         |   24 ++++++++++++++++++++++++
 modules/{ => access}/.gitignore             |    0 
 modules/{ => access_filter}/.gitignore      |    0 
 modules/{ => access_output}/.gitignore      |    0 
 modules/{ => audio_filter}/.gitignore       |    0 
 modules/{ => audio_mixer}/.gitignore        |    0 
 modules/{ => audio_output}/.gitignore       |    0 
 modules/{ => codec}/.gitignore              |    0 
 modules/{ => control}/.gitignore            |    0 
 modules/{ => demux}/.gitignore              |    0 
 modules/{ => gui}/.gitignore                |    0 
 modules/{ => meta_engine}/.gitignore        |    0 
 modules/{ => misc}/.gitignore               |    0 
 modules/{ => mux}/.gitignore                |    0 
 modules/{ => packetizer}/.gitignore         |    0 
 modules/{ => services_discovery}/.gitignore |    0 
 modules/{ => stream_out}/.gitignore         |    0 
 modules/{ => video_chroma}/.gitignore       |    0 
 modules/{ => video_filter}/.gitignore       |    0 
 modules/{ => video_output}/.gitignore       |    0 
 modules/{ => visualization}/.gitignore      |    0 
 22 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bootstrap b/bootstrap
index 8390370..0c5935b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -95,14 +95,6 @@ EOF
 
 modules=""
 
-rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF
-# Autogenerated by bootstrap - DO NOT EDIT
-EXTRA_DIST = LIST
-dist_noinst_SCRIPTS = genmf
-SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
-
-EOF
-
 modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 
 cat >> m4/private.m4 << EOF
diff --git a/modules/Makefile.am b/modules/Makefile.am
new file mode 100644
index 0000000..9a19d31
--- /dev/null
+++ b/modules/Makefile.am
@@ -0,0 +1,24 @@
+SUBDIRS = \
+	access \
+	access_filter \
+	access_output \
+	audio_filter \
+	audio_mixer \
+	audio_output \
+	codec \
+	control \
+	demux \
+	gui \
+	meta_engine \
+	misc \
+	mux \
+	packetizer \
+	services_discovery \
+	stream_out \
+	video_chroma \
+	video_filter \
+	video_output \
+	visualization
+
+dist_noinst_SCRIPTS = genmf list.sh
+dist_noinst_DATA = LIST
diff --git a/modules/.gitignore b/modules/access/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/access/.gitignore
diff --git a/modules/.gitignore b/modules/access_filter/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/access_filter/.gitignore
diff --git a/modules/.gitignore b/modules/access_output/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/access_output/.gitignore
diff --git a/modules/.gitignore b/modules/audio_filter/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/audio_filter/.gitignore
diff --git a/modules/.gitignore b/modules/audio_mixer/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/audio_mixer/.gitignore
diff --git a/modules/.gitignore b/modules/audio_output/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/audio_output/.gitignore
diff --git a/modules/.gitignore b/modules/codec/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/codec/.gitignore
diff --git a/modules/.gitignore b/modules/control/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/control/.gitignore
diff --git a/modules/.gitignore b/modules/demux/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/demux/.gitignore
diff --git a/modules/.gitignore b/modules/gui/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/gui/.gitignore
diff --git a/modules/.gitignore b/modules/meta_engine/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/meta_engine/.gitignore
diff --git a/modules/.gitignore b/modules/misc/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/misc/.gitignore
diff --git a/modules/.gitignore b/modules/mux/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/mux/.gitignore
diff --git a/modules/.gitignore b/modules/packetizer/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/packetizer/.gitignore
diff --git a/modules/.gitignore b/modules/services_discovery/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/services_discovery/.gitignore
diff --git a/modules/.gitignore b/modules/stream_out/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/stream_out/.gitignore
diff --git a/modules/.gitignore b/modules/video_chroma/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/video_chroma/.gitignore
diff --git a/modules/.gitignore b/modules/video_filter/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/video_filter/.gitignore
diff --git a/modules/.gitignore b/modules/video_output/.gitignore
similarity index 100%
copy from modules/.gitignore
copy to modules/video_output/.gitignore
diff --git a/modules/.gitignore b/modules/visualization/.gitignore
similarity index 100%
rename from modules/.gitignore
rename to modules/visualization/.gitignore