[vlc-commits] Generate Makefile.am in directories with Modules.am

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 30 19:19:53 2011 +0300| [27ba1dbc3c5ec7d3028235cb6a16543fda117cd7] | committer: Rémi Denis-Courmont

Generate Makefile.am in directories with Modules.am

...rather than in all modules/* directories

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

 bootstrap     |    8 +++++++-
 modules/genmf |    2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bootstrap b/bootstrap
index 07c7312..18f5933 100755
--- a/bootstrap
+++ b/bootstrap
@@ -91,7 +91,13 @@ AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
 EOF
 fi
 
-sh modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
+find modules/ -name Modules.am | \
+sed -ne 's,modules/\(.*\)/Modules.am,\1,p' | \
+while read d; do
+	sh modules/genmf "$d"
+	printf "."
+done
+printf "\n"
 
 ###
 ###  classic bootstrap stuff
diff --git a/modules/genmf b/modules/genmf
index 1f06b3b..aefd560 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -11,7 +11,6 @@ cd $(dirname "$0")/.. || exit 1
 
 while test "$1"
 do
-  printf "."
   dir="$1"
   modf="modules/${dir}/Modules.am"
   if ! test -f "$modf"; then
@@ -69,4 +68,3 @@ EOF
 
   shift
 done
-printf "\n"