Commit 3b16a551 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Speed up recursive make significantly

parent bb137a27
...@@ -270,6 +270,9 @@ vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in ...@@ -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) && $(SHELL) ./config.status --file=$@
-cd $(top_builddir) && chmod 0755 $@ -cd $(top_builddir) && chmod 0755 $@
vlc-config.in: vlc-config.in.in
./config.status --recheck
$(SOURCES): vlc-config $(SOURCES): vlc-config
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
......
...@@ -223,9 +223,9 @@ clean-local: ...@@ -223,9 +223,9 @@ clean-local:
all: all-modules all: all-modules
all-modules: all-modules:
@set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\ @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 "\$(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) --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 "\$(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) --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 "\$(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; \\ \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
test -z "\$\$fail" test -z "\$\$fail"
......
...@@ -37,6 +37,7 @@ Options: ...@@ -37,6 +37,7 @@ Options:
[--version] print version and exit [--version] print version and exit
[--linkage] print linkage mode (c, c++, objc) [--linkage] print linkage mode (c, c++, objc)
[--target] print targets and exit [--target] print targets and exit
[--list] print modules names and exit
[--libs] output linking flags [--libs] output linking flags
[--cflags] output C compilation flags [--cflags] output C compilation flags
[--cxxflags] output C++ compilation flags [--cxxflags] output C++ compilation flags
...@@ -174,6 +175,9 @@ while test $# -gt 0; do ...@@ -174,6 +175,9 @@ while test $# -gt 0; do
--target) --target)
echo_target=yes echo_target=yes
;; ;;
--list)
echo_list=yes
;;
--cflags) --cflags)
echo_cflags=yes echo_cflags=yes
;; ;;
...@@ -270,6 +274,18 @@ if test "${echo_target}" = yes; then ...@@ -270,6 +274,18 @@ if test "${echo_target}" = yes; then
exit 0 exit 0
fi 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 if test "${echo_prefix}" = yes; then
echo "${prefix}" echo "${prefix}"
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment