Check-in modules/Makefile.am

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

diff --git a/bootstrap b/bootstrap
index 839037042ebf812134c27869aa1e76036de7c60f..0c5935b391e57133fb34c6ebc8f700fe7c9f600d 100755 (executable)
--- 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 (file)
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%
rename from modules/.gitignore
rename to modules/access/.gitignore

diff --git a/modules/access_filter/.gitignore b/modules/access_filter/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/access_filter/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/access_output/.gitignore b/modules/access_output/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/access_output/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/audio_filter/.gitignore b/modules/audio_filter/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/audio_filter/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/audio_mixer/.gitignore b/modules/audio_mixer/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/audio_mixer/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/audio_output/.gitignore b/modules/audio_output/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/audio_output/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/codec/.gitignore b/modules/codec/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/codec/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/control/.gitignore b/modules/control/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/control/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/demux/.gitignore b/modules/demux/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/demux/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/gui/.gitignore b/modules/gui/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/gui/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/meta_engine/.gitignore b/modules/meta_engine/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/meta_engine/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/misc/.gitignore b/modules/misc/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/misc/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/mux/.gitignore b/modules/mux/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/mux/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/packetizer/.gitignore b/modules/packetizer/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/packetizer/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/services_discovery/.gitignore b/modules/services_discovery/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/services_discovery/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/stream_out/.gitignore b/modules/stream_out/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/stream_out/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/video_chroma/.gitignore b/modules/video_chroma/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/video_chroma/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/video_filter/.gitignore b/modules/video_filter/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/video_filter/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/video_output/.gitignore b/modules/video_output/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/video_output/.gitignore
@@ -0,0 +1 @@
+Makefile.am

diff --git a/modules/visualization/.gitignore b/modules/visualization/.gitignore
new file mode 100644 (file)
index 0000000..08a6d72
--- /dev/null
+++ b/modules/visualization/.gitignore
@@ -0,0 +1 @@
+Makefile.am