pic libraries are now correctly installed when needed:

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index e6a94a61a267ae846e58a2969fcc8a06d56330b9..84806c4c688a348358df4372e4d7038a79e2215e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,11 +1,13 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id$
 ##
 ## Copyright (C) 2005-2006 the VideoLAN team
 ##
-##  Initial author: Sam Hocevar <sam@zoy.org>
+##  Authors: Sam Hocevar <sam@zoy.org>
+##           Rémi Denis-Courmont <rem # videolan # org>
+##
+## Muahaha! no annoying dollar I dee dollar that causes rebuild at commit
 
 if test "$#" != "0"; then
   echo "Usage: $0"
@@ -49,41 +51,34 @@ if test -d extras/contrib/bin; then
 fi
 
 # Check for automake
-amvers="none"
-if automake-1.9 --version >/dev/null 2>&1; then
-  amvers="-1.9"
-elif automake-1.8 --version >/dev/null 2>&1; then
-  amvers="-1.8"
-elif automake-1.7 --version >/dev/null 2>&1; then
-  amvers="-1.7"
-elif automake-1.6 --version >/dev/null 2>&1; then
-  amvers="-1.6"
-  if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
-    AUTOMAKESUCKS=yes
+amvers="no"
+for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
+  if automake${v} --version >/dev/null 2>&1; then
+    amsuff="${v}"
+    amvers="${v}"
+    break
   fi
-elif automake-1.5 --version >/dev/null 2>&1; then
-  INSTALLSUCKS=yes
-  amvers="-1.5"
-elif automake --version > /dev/null 2>&1; then
-  amvers=""
-  case "`automake --version | sed -e '1s/[^0-9]*//' -e q`" in
-    0|0.*|1|1.[01234]|1.[01234][-.]*)
-      amvers="none" ;;
-    1.5|1.5.*)
-      INSTALLSUCKS=yes ;;
-    1.6|1.6.0|1.6.1)
-      AUTOMAKESUCKS=yes ;;
-    1.9|1.9.2)
-      ;;
-  esac
-fi
+done
 
-if test "${amvers}" = "none"; then
-  set +x
-  echo "$0: you need automake version 1.5 or later"
-  exit 1
+if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
+  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
+  amsuff=""
 fi
 
+case "${amvers}" in
+  -1.6|16|1.6|1.6.0*|1.6.1*)
+    AUTOMAKESUCKS=yes
+    ;;
+  -1.5|15|1.5|1.5.*)
+    INSTALLSUCKS=yes
+    ;;
+  no|1.[01234]|1.[01234].*|1[01234])
+    set +x
+    echo "$0: you need automake version 1.5 or later"
+    exit 1
+    ;;
+esac
+
 # Check for libtool
 libtoolize="no"
 if glibtoolize --version >/dev/null 2>&1; then
@@ -198,7 +193,7 @@ do
   for mod in $mods
   do
     extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a lib${mod}_pic.a"
-    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}.la"
+    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}_builtin.la"
   done
   rm -f "${makf}" && cat > "${makf}" << EOF
 
@@ -210,8 +205,10 @@ mods = ${mods}
 
 NULL =
 libvlc_LTLIBRARIES =
+noinst_LTLIBRARIES =
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
+clean_modules =
 SUBDIRS = ${subdirs}
 SUFFIXES = _plugin\$(LIBEXT) _plugin.a
 
@@ -236,7 +233,7 @@ all-modules:
 if USE_LIBTOOL
        @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
        if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; fi; \\
-       if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.la;; esac; done; fi; \\
+       if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_builtin.la;; 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"
 else
@@ -260,9 +257,9 @@ _plugin.a_plugin\$(LIBEXT):
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
 #ifneq (,\$(findstring cygwin,\$(host)))
-#      mv "$@.exe" "$@"
+#      mv -f "\$@.exe" "\$@"
 #endif
-       @if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
+       @if test -f "\$@.exe"; then mv -f "\$@.exe" "\$@"; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
@@ -270,7 +267,13 @@ if MAINTAINER_MODE
 endif
 
 mostlyclean-local:
+if USE_LIBTOOL
+       -rm -f *.la
+else
        -rm -f *.a *\$(LIBEXT)
+endif
+
+clean-local: \$(clean_modules)
 
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
@@ -280,7 +283,7 @@ if USE_LIBTOOL
          z=\$\$(\$(VLC_CONFIG) --list plugin); \
          m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
-           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install ; \
+           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install-libvlcLTLIBRARIES || exit \$\$? ; \
        fi
 else
        mkdir -p -- "\$(DESTDIR)\$(libvlcdir)"
@@ -302,7 +305,7 @@ else
              ;; \
          esac; \
        done
-if BUILD_MOZILLA
+if BUILD_PIC
        @z=\$\$(\$(VLC_CONFIG) --list builtin); \
        for mod in \$(mods); do \
          case "\$\$z " \
@@ -321,7 +324,7 @@ if USE_LIBTOOL
          z=\$\$(\$(VLC_CONFIG) --list plugin); \
          m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
-           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall ; \
+           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall-libvlcLTLIBRARIES || exit \$\$?; \
        fi
 else
        @z=\$\$(\$(VLC_CONFIG) --list plugin); \
@@ -342,7 +345,7 @@ else
              ;; \
          esac; \
        done
-if BUILD_MOZILLA
+if BUILD_PIC
        @z=\$\$(\$(VLC_CONFIG) --list builtin); \
        for mod in \$(mods); do \
          case "\$\$z " \
@@ -376,7 +379,7 @@ EOF
 
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-clean-local: clean-${mod}
+clean_modules += clean-${mod}
 clean-${mod}:
        -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
 
@@ -418,21 +421,20 @@ lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
 lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
 
 lib${mod}_a_SOURCES = \$(SOURCES_${mod})
-lib${mod}_la_SOURCES = \$(SOURCES_${mod})
+lib${mod}_builtin_la_SOURCES = \$(SOURCES_${mod})
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-nodist_lib${mod}_la_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
+nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod})
+nodist_lib${mod}_builtin_la_SOURCES = \$(nodist_SOURCES_${mod})
 EOF
     fi
     cat >> "${makf}" << EOF
 lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
 lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
 lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-lib${mod}_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
-lib${mod}_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
-lib${mod}_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-lib${mod}_la_LDFLAGS = \`\$(VLC_CONFIG) --libs ${mod}\` -static
+lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
+lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
+lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
 
 EOF
   done