From 1412088fc990a72f4d19a09b532eb0a8a856b1bd Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sat, 25 Oct 2003 04:48:55 +0000 Subject: [PATCH] * bootstrap: + Fixed a typo causing the Mozilla plugin build to fail. + Call the generic rule in "all" instead of "all-am" to spare one make level of recursion. --- bootstrap | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap b/bootstrap index 99bc673470..b977c13809 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh ## bootstrap file for the VLC media player -## $Id: bootstrap,v 1.76 2003/10/25 03:44:46 sam Exp $ +## $Id: bootstrap,v 1.77 2003/10/25 04:48:55 sam Exp $ ## ## Authors: Sam Hocevar @@ -194,11 +194,12 @@ endif clean-local: -rm -f *.a *.so *.dll *.sl *.dylib -all-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 *\$\${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 *\$\${mod}.a*) echo lib\$\${mod}.a;; esac; done; fi; \\ - if test "\$(pic)" != "no"; then z=\$\$(\$(VLC_CONFIG) --target pic); for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | xargs`; do case "\$\$z" in *\$\${mod}_pic.a*) echo lib\$\${mod}_pic.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 *\$\${mod}_pic.a*) 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" -- 2.39.5