From: Rémi Denis-Courmont <rem@videolan.org>
Date: Fri, 12 Aug 2005 19:17:33 +0000 (+0000)
Subject: Speed up recursive make significantly
X-Git-Tag: 0.8.4~884
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3b16a551afc5b31cf8fe829154635dda46cf7aaf;p=vlc

Speed up recursive make significantly
---

diff --git a/Makefile.am b/Makefile.am
index 90695049c2..8984940bcd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,6 +270,9 @@ vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
 	cd $(top_builddir) && $(SHELL) ./config.status --file=$@
 	-cd $(top_builddir) && chmod 0755 $@
 
+vlc-config.in: vlc-config.in.in
+	./config.status --recheck
+
 $(SOURCES): vlc-config
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/bootstrap b/bootstrap
index ed3098eb3b..8cd918038f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -223,9 +223,9 @@ clean-local:
 all: all-modules
 all-modules:
 	@set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
-	if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target plugin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in */lib\$\${mod}_plugin*) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
-	if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target builtin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in */lib\$\${mod}.a*) echo lib\$\${mod}.a;; esac; done; fi; \\
-	if test "\$(pic)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target builtin pic); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in */lib\$\${mod}_pic.a*) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
+	if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
+	if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\
+	if test "\$(pic)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
 	\`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
 	test -z "\$\$fail"
 
diff --git a/vlc-config.in.in b/vlc-config.in.in
index 658c893c6a..34945deb0d 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -37,6 +37,7 @@ Options:
         [--version]               print version and exit
         [--linkage]               print linkage mode (c, c++, objc)
         [--target]                print targets and exit
+        [--list]                  print modules names and exit
         [--libs]                  output linking flags
         [--cflags]                output C compilation flags
         [--cxxflags]              output C++ compilation flags
@@ -174,6 +175,9 @@ while test $# -gt 0; do
     --target)
       echo_target=yes
       ;;
+    --list)
+      echo_list=yes
+      ;;
     --cflags)
       echo_cflags=yes
       ;;
@@ -270,6 +274,18 @@ if test "${echo_target}" = yes; then
   exit 0
 fi
 
+if test "${echo_list}" = yes; then
+  if test "${echo_plugin}" = yes; then
+    echo "${plugins}"
+    printf '\n'
+  fi
+  if test "${echo_builtin}" = yes; then
+    echo "${builtins}"
+    printf '\n'
+  fi
+  exit 0
+fi
+
 if test "${echo_prefix}" = yes; then
   echo "${prefix}"
 fi