Hey Markus,
I you don't like have to make these changes to bypass the docs and stuff
(btw...they aren't required on the Mac???), you could just change
lib-src/Makefile from:
# libtwolame
libtwolame-recursive:
$(MAKE) -C twolame
libtwolame.a: libtwolame-recursive
ln -sf twolame/libtwolame/.libs/libtwolame.a libtwolame.a
to:
# libtwolame
libtwolame-recursive:
$(MAKE) -C twolame/libtwolame libtwolame.la
libtwolame.a: libtwolame-recursive
ln -sf twolame/libtwolame/.libs/libtwolame.a libtwolame.a
I used the same method for the new version of portaudio-v19
Leland
On 10/23/06 1:43 PM, "Markus Meyer" <[EMAIL PROTECTED]> wrote:
> Update of /cvsroot/audacity/lib-src/twolame/build
> In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11212/build
>
> Modified Files:
> config.guess config.sub depcomp install-sh ltmain.sh missing
> mkinstalldirs
> Log Message:
> Only build libtwolame, nothing else
>
> Index: mkinstalldirs
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/mkinstalldirs,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- mkinstalldirs 19 Oct 2006 09:44:31 -0000 1.1
> +++ mkinstalldirs 23 Oct 2006 18:43:23 -0000 1.2
> @@ -1,21 +1,33 @@
> #! /bin/sh
> # mkinstalldirs --- make directory hierarchy
> -# Author: Noah Friedman <[EMAIL PROTECTED]>
> +
> +scriptversion=2005-06-29.22
> +
> +# Original author: Noah Friedman <[EMAIL PROTECTED]>
> # Created: 1993-05-16
> -# Public domain
> +# Public domain.
> +#
> +# This file is maintained in Automake, please report
> +# bugs to <[email protected]> or send patches to
> +# <[email protected]>.
>
> errstatus=0
> -dirmode=""
> +dirmode=
>
> usage="\
> -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
> +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
> +
> +Create each directory DIR (with mode MODE, if specified), including all
> +leading file name components.
> +
> +Report bugs to <[email protected]>."
>
> # process command line arguments
> while test $# -gt 0 ; do
> case $1 in
> -h | --help | --h*) # -h for help
> - echo "$usage" 1>&2
> - exit 0
> + echo "$usage"
> + exit $?
> ;;
> -m) # -m PERM arg
> shift
> @@ -23,6 +35,10 @@
> dirmode=$1
> shift
> ;;
> + --version)
> + echo "$0 $scriptversion"
> + exit $?
> + ;;
> --) # stop option processing
> shift
> break
> @@ -50,30 +66,58 @@
> 0) exit 0 ;;
> esac
>
> +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
> +# mkdir -p a/c at the same time, both will detect that a is missing,
> +# one will create a, then the other will try to create a and die with
> +# a "File exists" error. This is a problem when calling mkinstalldirs
> +# from a parallel make. We use --version in the probe to restrict
> +# ourselves to GNU mkdir, which is thread-safe.
> case $dirmode in
> '')
> - if mkdir -p -- . 2>/dev/null; then
> + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
> echo "mkdir -p -- $*"
> exec mkdir -p -- "$@"
> + else
> + # On NextStep and OpenStep, the `mkdir' command does not
> + # recognize any option. It will interpret all options as
> + # directories to create, and then abort because `.' already
> + # exists.
> + test -d ./-p && rmdir ./-p
> + test -d ./--version && rmdir ./--version
> fi
> ;;
> *)
> - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
> + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
> + test ! -d ./--version; then
> echo "mkdir -m $dirmode -p -- $*"
> exec mkdir -m "$dirmode" -p -- "$@"
> + else
> + # Clean up after NextStep and OpenStep mkdir.
> + for d in ./-m ./-p ./--version "./$dirmode";
> + do
> + test -d $d && rmdir $d
> + done
> fi
> ;;
> esac
>
> for file
> do
> - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
> + case $file in
> + /*) pathcomp=/ ;;
> + *) pathcomp= ;;
> + esac
> + oIFS=$IFS
> + IFS=/
> + set fnord $file
> shift
> + IFS=$oIFS
>
> - pathcomp=
> for d
> do
> - pathcomp="$pathcomp$d"
> + test "x$d" = x && continue
> +
> + pathcomp=$pathcomp$d
> case $pathcomp in
> -*) pathcomp=./$pathcomp ;;
> esac
> @@ -84,21 +128,21 @@
> mkdir "$pathcomp" || lasterr=$?
>
> if test ! -d "$pathcomp"; then
> - errstatus=$lasterr
> + errstatus=$lasterr
> else
> - if test ! -z "$dirmode"; then
> + if test ! -z "$dirmode"; then
> echo "chmod $dirmode $pathcomp"
> - lasterr=""
> - chmod "$dirmode" "$pathcomp" || lasterr=$?
> + lasterr=
> + chmod "$dirmode" "$pathcomp" || lasterr=$?
>
> - if test ! -z "$lasterr"; then
> - errstatus=$lasterr
> - fi
> - fi
> + if test ! -z "$lasterr"; then
> + errstatus=$lasterr
> + fi
> + fi
> fi
> fi
>
> - pathcomp="$pathcomp/"
> + pathcomp=$pathcomp/
> done
> done
>
> @@ -107,5 +151,8 @@
> # Local Variables:
> # mode: shell-script
> # sh-indentation: 2
> +# eval: (add-hook 'write-file-hooks 'time-stamp)
> +# time-stamp-start: "scriptversion="
> +# time-stamp-format: "%:y-%02m-%02d.%02H"
> +# time-stamp-end: "$"
> # End:
> -# mkinstalldirs ends here
>
> Index: missing
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/missing,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- missing 19 Oct 2006 09:44:31 -0000 1.1
> +++ missing 23 Oct 2006 18:43:23 -0000 1.2
> @@ -1,9 +1,9 @@
> #! /bin/sh
> # Common stub for a few missing GNU programs while installing.
>
> -scriptversion=2003-09-02.23
> +scriptversion=2005-06-08.21
>
> -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
> +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
> # Free Software Foundation, Inc.
> # Originally by Fran,cois Pinard <[EMAIL PROTECTED]>, 1996.
>
> @@ -19,8 +19,8 @@
>
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> -# 02111-1307, USA.
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +# 02110-1301, USA.
>
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> @@ -60,11 +60,6 @@
> msg="probably too old"
> fi
> ;;
> -esac
> -
> -# If it does not exist, or fails to run (possibly an outdated version),
> -# try to emulate it.
> -case "$1" in
>
> -h|--h|--he|--hel|--help)
> echo "\
> @@ -92,10 +87,12 @@
> yacc create \`y.tab.[ch]', if possible, from existing .[ch]
>
> Send bug reports to <[email protected]>."
> + exit $?
> ;;
>
> -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
> echo "missing $scriptversion (GNU Automake)"
> + exit $?
> ;;
>
> -*)
> @@ -104,12 +101,42 @@
> exit 1
> ;;
>
> - aclocal*)
> +esac
> +
> +# Now exit if we have it, but it failed. Also exit now if we
> +# don't have it and --version was passed (most likely to detect
> +# the program).
> +case "$1" in
> + lex|yacc)
> + # Not GNU programs, they don't have --version.
> + ;;
> +
> + tar)
> + if test -n "$run"; then
> + echo 1>&2 "ERROR: \`tar' requires --run"
> + exit 1
> + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
> + exit 1
> + fi
> + ;;
> +
> + *)
> if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
> # We have it, but it failed.
> exit 1
> + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
> + # Could not run --version or --help. This is probably someone
> + # running `$TOOL --version' or `$TOOL --help' to check whether
> + # $TOOL exists and not knowing $TOOL uses missing.
> + exit 1
> fi
> + ;;
> +esac
>
> +# If it does not exist, or fails to run (possibly an outdated version),
> +# try to emulate it.
> +case "$1" in
> + aclocal*)
> echo 1>&2 "\
> WARNING: \`$1' is $msg. You should only need it if
> you modified \`acinclude.m4' or \`${configure_ac}'. You might want
> @@ -119,11 +146,6 @@
> ;;
>
> autoconf)
> - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
> - # We have it, but it failed.
> - exit 1
> - fi
> -
> echo 1>&2 "\
> WARNING: \`$1' is $msg. You should only need it if
> you modified \`${configure_ac}'. You might want to install the
> @@ -133,11 +155,6 @@
> ;;
>
> autoheader)
> - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
> - # We have it, but it failed.
> - exit 1
> - fi
> -
> echo 1>&2 "\
> WARNING: \`$1' is $msg. You should only need it if
> you modified \`acconfig.h' or \`${configure_ac}'. You might want
> @@ -157,11 +174,6 @@
> ;;
>
> automake*)
> - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
> - # We have it, but it failed.
> - exit 1
> - fi
> -
> echo 1>&2 "\
> WARNING: \`$1' is $msg. You should only need it if
> you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
> @@ -173,11 +185,6 @@
> ;;
>
> autom4te)
> - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
> - # We have it, but it failed.
> - exit 1
> - fi
> -
> echo 1>&2 "\
> WARNING: \`$1' is needed, but is $msg.
> You might have modified some files without having the
> @@ -254,11 +261,6 @@
> ;;
>
> help2man)
> - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
> - # We have it, but it failed.
> - exit 1
> - fi
> -
> echo 1>&2 "\
> WARNING: \`$1' is $msg. You should only need it if
> you modified a dependency of a manual page. You may need the
> @@ -279,11 +281,6 @@
> ;;
>
> makeinfo)
> - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
> - # We have makeinfo, but it failed.
> - exit 1
> - fi
> -
> echo 1>&2 "\
> WARNING: \`$1' is $msg. You should only need it if
> you modified a \`.texi' or \`.texinfo' file, or any other file
> @@ -291,20 +288,23 @@
> call might also be the consequence of using a buggy \`make' (AIX,
> DU, IRIX). You might want to install the \`Texinfo' package or
> the \`GNU make' package. Grab either from any GNU archive site."
> + # The file to touch is that specified with -o ...
> file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
> if test -z "$file"; then
> - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
> - file=`sed -n '/[EMAIL PROTECTED]/ { s/.* \([^ ]*\) *$/\1/; p; q; }'
> $file`
> + # ... or it is the one specified with @setfilename ...
> + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
> + file=`sed -n '/[EMAIL PROTECTED]/ { s/.* \([^ ]*\) *$/\1/; p; q; }'
> $infile`
> + # ... or it is derived from the source name (dir/f.texi becomes f.info)
> + test -z "$file" && file=`echo "$infile" | sed
> 's,.*/,,;s,.[^.]*$,,'`.info
> fi
> + # If the file does not exist, the user really needs makeinfo;
> + # let's fail without touching anything.
> + test -f $file || exit 1
> touch $file
> ;;
>
> tar)
> shift
> - if test -n "$run"; then
> - echo 1>&2 "ERROR: \`tar' requires --run"
> - exit 1
> - fi
>
> # We have already tried tar in the generic part.
> # Look for gnutar/gtar before invocation to avoid ugly error
>
> Index: config.guess
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/config.guess,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- config.guess 19 Oct 2006 09:44:30 -0000 1.1
> +++ config.guess 23 Oct 2006 18:43:22 -0000 1.2
> @@ -3,7 +3,7 @@
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
> # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>
> -timestamp='2005-12-13'
> +timestamp='2005-08-03'
>
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> @@ -779,7 +779,7 @@
> i*:PW*:*)
> echo ${UNAME_MACHINE}-pc-pw32
> exit ;;
> - x86:Interix*:[345]*)
> + x86:Interix*:[34]*)
> echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
> exit ;;
> [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> @@ -851,7 +851,7 @@
> #endif
> #endif
> EOF
> - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
> + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
> test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> ;;
> mips64:Linux:*:*)
> @@ -870,7 +870,7 @@
> #endif
> #endif
> EOF
> - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
> + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
> test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> ;;
> or32:Linux:*:*)
> @@ -919,9 +919,6 @@
> sparc:Linux:*:* | sparc64:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-gnu
> exit ;;
> - vax:Linux:*:*)
> - echo ${UNAME_MACHINE}-dec-linux-gnu
> - exit ;;
> x86_64:Linux:*:*)
> echo x86_64-unknown-linux-gnu
> exit ;;
> @@ -967,7 +964,7 @@
> LIBC=gnulibc1
> # endif
> #else
> - #if defined(__INTEL_COMPILER) || defined(__PGI)
> + #ifdef __INTEL_COMPILER
> LIBC=gnu
> #else
> LIBC=gnuaout
> @@ -977,7 +974,7 @@
> LIBC=dietlibc
> #endif
> EOF
> - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
> + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
> test x"${LIBC}" != x && {
> echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> exit
> @@ -1188,6 +1185,7 @@
> *:Darwin:*:*)
> UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> case $UNAME_PROCESSOR in
> + *86) UNAME_PROCESSOR=i686 ;;
> unknown) UNAME_PROCESSOR=powerpc ;;
> esac
> echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
> @@ -1266,9 +1264,6 @@
> i*86:skyos:*:*)
> echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> exit ;;
> - i*86:rdos:*:*)
> - echo ${UNAME_MACHINE}-pc-rdos
> - exit ;;
> esac
>
> #echo '(No uname command or uname output not recognized.)' 1>&2
>
> Index: config.sub
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/config.sub,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- config.sub 19 Oct 2006 09:44:30 -0000 1.1
> +++ config.sub 23 Oct 2006 18:43:22 -0000 1.2
> @@ -3,7 +3,7 @@
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
> # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>
> -timestamp='2005-12-11'
> +timestamp='2005-07-08'
>
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
> @@ -119,9 +119,8 @@
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
> case $maybe_os in
> - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
> - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* |
> netbsd*-gnu* | \
> - storm-chaos* | os2-emx* | rtmk-nova*)
> + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* |
> uclinux-gnu* | \
> + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* |
> rtmk-nova*)
> os=-$maybe_os
> basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
> ;;
> @@ -172,10 +171,6 @@
> -hiux*)
> os=-hiuxwe2
> ;;
> - -sco6)
> - os=-sco5v6
> - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> - ;;
> -sco5)
> os=-sco3.2v5
> basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> @@ -192,10 +187,6 @@
> # Don't forget version if it is 3.2v4 or newer.
> basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> ;;
> - -sco5v6*)
> - # Don't forget version if it is 3.2v4 or newer.
> - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> - ;;
> -sco*)
> os=-sco3.2v2
> basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> @@ -266,7 +257,7 @@
> | mipsisa64sr71k | mipsisa64sr71kel \
> | mipstx39 | mipstx39el \
> | mn10200 | mn10300 \
> - | mt \
> + | ms1 \
> | msp430 \
> | ns16k | ns32k \
> | or32 \
> @@ -295,9 +286,6 @@
> ;;
> m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> ;;
> - ms1)
> - basic_machine=mt-unknown
> - ;;
>
> # We use `pc' rather than `unknown'
> # because (1) that's what they normally are, and
> @@ -348,7 +336,7 @@
> | mipsisa64sr71k-* | mipsisa64sr71kel-* \
> | mipstx39-* | mipstx39el-* \
> | mmix-* \
> - | mt-* \
> + | ms1-* \
> | msp430-* \
> | none-* | np1-* | ns16k-* | ns32k-* \
> | orion-* \
> @@ -708,9 +696,6 @@
> basic_machine=i386-pc
> os=-msdos
> ;;
> - ms1-*)
> - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
> - ;;
> mvs)
> basic_machine=i370-ibm
> os=-mvs
> @@ -874,10 +859,6 @@
> basic_machine=i586-unknown
> os=-pw32
> ;;
> - rdos)
> - basic_machine=i386-pc
> - os=-rdos
> - ;;
> rom68k)
> basic_machine=m68k-rom68k
> os=-coff
> @@ -1200,15 +1181,14 @@
> | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
> | -chorusos* | -chorusrdb* \
> | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
> - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
> - | -uxpv* | -beos* | -mpeix* | -udk* \
> + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix*
> | -udk* \
> | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
> - | -skyos* | -haiku* | -rdos*)
> + | -skyos* | -haiku*)
> # Remember, each alternative MUST END IN *, to match a version number.
> ;;
> -qnx*)
>
> Index: ltmain.sh
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/ltmain.sh,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- ltmain.sh 19 Oct 2006 09:44:30 -0000 1.1
> +++ ltmain.sh 23 Oct 2006 18:43:22 -0000 1.2
> @@ -43,7 +43,7 @@
>
> PROGRAM=ltmain.sh
> PACKAGE=libtool
> -VERSION=1.5.22
> +VERSION="1.5.22 Debian 1.5.22-2"
> TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
>
> # See if we are running on zsh, and set the options which allow our
> @@ -2082,7 +2082,10 @@
> case $pass in
> dlopen) libs="$dlfiles" ;;
> dlpreopen) libs="$dlprefiles" ;;
> - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
> + link)
> + libs="$deplibs %DEPLIBS%"
> + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
> + ;;
> esac
> fi
> if test "$pass" = dlopen; then
> @@ -3201,6 +3204,11 @@
> age="$number_minor"
> revision="$number_minor"
> ;;
> + *)
> + $echo "$modename: unknown library version type \`$version_type'" 1>&2
> + $echo "Fatal configuration error. See the $PACKAGE docs for more
> information." 1>&2
> + exit $EXIT_FAILURE
> + ;;
> esac
> ;;
> no)
>
> Index: depcomp
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/depcomp,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- depcomp 19 Oct 2006 09:44:30 -0000 1.1
> +++ depcomp 23 Oct 2006 18:43:22 -0000 1.2
> @@ -1,9 +1,9 @@
> #! /bin/sh
> # depcomp - compile a program generating dependencies as side-effects
>
> -scriptversion=2004-04-25.13
> +scriptversion=2005-07-09.11
>
> -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
> +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
>
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> @@ -17,8 +17,8 @@
>
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> -# 02111-1307, USA.
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +# 02110-1301, USA.
>
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> @@ -43,17 +43,18 @@
> depmode Dependency tracking mode.
> source Source file read by `PROGRAMS ARGS'.
> object Object file output by `PROGRAMS ARGS'.
> + DEPDIR directory where to store dependencies.
> depfile Dependency file to output.
> tmpdepfile Temporary file to use when outputing dependencies.
> libtool Whether libtool is used (yes/no).
>
> Report bugs to <[email protected]>.
> EOF
> - exit 0
> + exit $?
> ;;
> -v | --v*)
> echo "depcomp $scriptversion"
> - exit 0
> + exit $?
> ;;
> esac
>
> @@ -61,18 +62,10 @@
> echo "depcomp: Variables source, object and depmode must be set" 1>&2
> exit 1
> fi
> -# `libtool' can also be set to `yes' or `no'.
> -
> -if test -z "$depfile"; then
> - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
> - dir=`echo "$object" | sed 's,/.*$,/,'`
> - if test "$dir" = "$object"; then
> - dir=
> - fi
> - # FIXME: should be _deps on DOS.
> - depfile="$dir.deps/$base"
> -fi
>
> +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
> +depfile=${depfile-`echo "$object" |
> + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
> tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
>
> rm -f "$tmpdepfile"
> @@ -294,33 +287,43 @@
> base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
>
> if test "$libtool" = yes; then
> - # Dependencies are output in .lo.d with libtool 1.4.
> - # They are output in .o.d with libtool 1.5.
> - tmpdepfile1="$dir.libs/$base.lo.d"
> - tmpdepfile2="$dir.libs/$base.o.d"
> - tmpdepfile3="$dir.libs/$base.d"
> + # With Tru64 cc, shared objects can also be used to make a
> + # static library. This mecanism is used in libtool 1.4 series to
> + # handle both shared and static libraries in a single compilation.
> + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
> + #
> + # With libtool 1.5 this exception was removed, and libtool now
> + # generates 2 separate objects for the 2 libraries. These two
> + # compilations output dependencies in in $dir.libs/$base.o.d and
> + # in $dir$base.o.d. We have to check for both files, because
> + # one of the two compilations can be disabled. We should prefer
> + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
> + # automatically cleaned when .libs/ is deleted, while ignoring
> + # the former would cause a distcleancheck panic.
> + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
> + tmpdepfile2=$dir$base.o.d # libtool 1.5
> + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
> + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
> "$@" -Wc,-MD
> else
> - tmpdepfile1="$dir$base.o.d"
> - tmpdepfile2="$dir$base.d"
> - tmpdepfile3="$dir$base.d"
> + tmpdepfile1=$dir$base.o.d
> + tmpdepfile2=$dir$base.d
> + tmpdepfile3=$dir$base.d
> + tmpdepfile4=$dir$base.d
> "$@" -MD
> fi
>
> stat=$?
> if test $stat -eq 0; then :
> else
> - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
> + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
> exit $stat
> fi
>
> - if test -f "$tmpdepfile1"; then
> - tmpdepfile="$tmpdepfile1"
> - elif test -f "$tmpdepfile2"; then
> - tmpdepfile="$tmpdepfile2"
> - else
> - tmpdepfile="$tmpdepfile3"
> - fi
> + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
> "$tmpdepfile4"
> + do
> + test -f "$tmpdepfile" && break
> + done
> if test -f "$tmpdepfile"; then
> sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
> # That's a tab and a space in the [].
> @@ -464,7 +467,8 @@
> done
>
> "$@" -E |
> - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
> + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
> + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
> sed '$ s: \\$::' > "$tmpdepfile"
> rm -f "$depfile"
> echo "$object : \\" > "$depfile"
>
> Index: install-sh
> ===================================================================
> RCS file: /cvsroot/audacity/lib-src/twolame/build/install-sh,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- install-sh 19 Oct 2006 09:44:30 -0000 1.1
> +++ install-sh 23 Oct 2006 18:43:22 -0000 1.2
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # install - install a program, script, or datafile
>
> -scriptversion=2004-04-01.17
> +scriptversion=2005-05-14.22
>
> # This originates from X11R5 (mit/util/scripts/install.sh), which was
> # later released in X11R6 (xc/config/util/install.sh) with the
> @@ -58,9 +58,6 @@
> rmprog="${RMPROG-rm}"
> mkdirprog="${MKDIRPROG-mkdir}"
>
> -transformbasename=
> -transform_arg=
> -instcmd="$mvprog"
> chmodcmd="$chmodprog 0755"
> chowncmd=
> chgrpcmd=
> @@ -70,23 +67,27 @@
> src=
> dst=
> dir_arg=
> +dstarg=
> +no_target_directory=
>
> -usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
> +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
> or: $0 [OPTION]... SRCFILES... DIRECTORY
> - or: $0 -d DIRECTORIES...
> + or: $0 [OPTION]... -t DIRECTORY SRCFILES...
> + or: $0 [OPTION]... -d DIRECTORIES...
>
> -In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
> -In the second, create the directory path DIR.
> +In the 1st form, copy SRCFILE to DSTFILE.
> +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
> +In the 4th, create DIRECTORIES.
>
> Options:
> --b=TRANSFORMBASENAME
> --c copy source (using $cpprog) instead of moving (using $mvprog).
> +-c (ignored)
> -d create directories instead of installing files.
> --g GROUP $chgrp installed files to GROUP.
> --m MODE $chmod installed files to MODE.
> --o USER $chown installed files to USER.
> --s strip installed files (using $stripprog).
> --t=TRANSFORM
> +-g GROUP $chgrpprog installed files to GROUP.
> +-m MODE $chmodprog installed files to MODE.
> +-o USER $chownprog installed files to USER.
> +-s $stripprog installed files.
> +-t DIRECTORY install into DIRECTORY.
> +-T report an error if DSTFILE is a directory.
> --help display this help and exit.
> --version display version info and exit.
>
> @@ -96,12 +97,7 @@
>
> while test -n "$1"; do
> case $1 in
> - -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
> - shift
> - continue;;
> -
> - -c) instcmd=$cpprog
> - shift
> + -c) shift
> continue;;
>
> -d) dir_arg=true
> @@ -113,7 +109,7 @@
> shift
> continue;;
>
> - --help) echo "$usage"; exit 0;;
> + --help) echo "$usage"; exit $?;;
>
> -m) chmodcmd="$chmodprog $2"
> shift
> @@ -129,14 +125,20 @@
> shift
> continue;;
>
> - -t=*) transformarg=`echo $1 | sed 's/-t=//'`
> - shift
> - continue;;
> + -t) dstarg=$2
> + shift
> + shift
> + continue;;
>
> - --version) echo "$0 $scriptversion"; exit 0;;
> + -T) no_target_directory=true
> + shift
> + continue;;
> +
> + --version) echo "$0 $scriptversion"; exit $?;;
>
> *) # When -d is used, all remaining arguments are directories to create.
> - test -n "$dir_arg" && break
> + # When -t is used, the destination is already specified.
> + test -n "$dir_arg$dstarg" && break
> # Otherwise, the last argument is the destination. Remove it from
> [EMAIL PROTECTED]
> for arg
> do
> @@ -174,13 +176,13 @@
> src=
>
> if test -d "$dst"; then
> - instcmd=:
> + mkdircmd=:
> chmodcmd=
> else
> - instcmd=$mkdirprog
> + mkdircmd=$mkdirprog
> fi
> else
> - # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
> + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
> # might cause directories to be created, which would be especially bad
> # if $src (and thus $dsttmp) contains '*'.
> if test ! -f "$src" && test ! -d "$src"; then
> @@ -202,12 +204,16 @@
> # If destination is a directory, append the input filename; won't work
> # if double slashes aren't ignored.
> if test -d "$dst"; then
> + if test -n "$no_target_directory"; then
> + echo "$0: $dstarg: Is a directory" >&2
> + exit 1
> + fi
> dst=$dst/`basename "$src"`
> fi
> fi
>
> # This sed command emulates the dirname command.
> - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
> + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
>
> # Make sure that the destination directory exists.
>
> @@ -220,7 +226,8 @@
> oIFS=$IFS
> # Some sh's can't handle IFS=/ for some reason.
> IFS='%'
> - set - `echo "$dstdir" | sed -e 's@/@[EMAIL PROTECTED]' -e '[EMAIL
> PROTECTED]@/@'`
> + set x `echo "$dstdir" | sed -e 's@/@[EMAIL PROTECTED]' -e '[EMAIL
> PROTECTED]@/@'`
> + shift
> IFS=$oIFS
>
> pathcomp=
> @@ -229,51 +236,42 @@
> pathcomp=$pathcomp$1
> shift
> if test ! -d "$pathcomp"; then
> - $mkdirprog "$pathcomp" || lasterr=$?
> + $mkdirprog "$pathcomp"
> # mkdir can fail with a `File exist' error in case several
> # install-sh are creating the directory concurrently. This
> # is OK.
> - test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
> + test -d "$pathcomp" || exit
> fi
> pathcomp=$pathcomp/
> done
> fi
>
> if test -n "$dir_arg"; then
> - $doit $instcmd "$dst" \
> + $doit $mkdircmd "$dst" \
> && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
> && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
> && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
> && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
>
> else
> - # If we're going to rename the final executable, determine the name now.
> - if test -z "$transformarg"; then
> - dstfile=`basename "$dst"`
> - else
> - dstfile=`basename "$dst" $transformbasename \
> - | sed $transformarg`$transformbasename
> - fi
> -
> - # don't allow the sed command to completely eliminate the filename.
> - test -z "$dstfile" && dstfile=`basename "$dst"`
> + dstfile=`basename "$dst"`
>
> # Make a couple of temp file names in the proper directory.
> dsttmp=$dstdir/_inst.$$_
> rmtmp=$dstdir/_rm.$$_
>
> # Trap to clean up those temp files at exit.
> - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
> + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
> trap '(exit $?); exit' 1 2 13 15
>
> - # Move or copy the file name to the temp name
> - $doit $instcmd "$src" "$dsttmp" &&
> + # Copy the file name to the temp name.
> + $doit $cpprog "$src" "$dsttmp" &&
>
> # and set any options; do chmod last to preserve setuid bits.
> #
> # If any of these fail, we abort the whole thing. If we want to
> # ignore errors from any of these, just make sure not to ignore
> - # errors from the above "$doit $instcmd $src $dsttmp" command.
> + # errors from the above "$doit $cpprog $src $dsttmp" command.
> #
> { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
> && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
> @@ -298,7 +296,7 @@
> || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
> || {
> echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
> - (exit 1); exit
> + (exit 1); exit 1
> }
> else
> :
> @@ -309,12 +307,12 @@
> $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
> }
> }
> - fi || { (exit 1); exit; }
> + fi || { (exit 1); exit 1; }
> done
>
> # The final little trick to "correctly" pass the exit status to the exit
> trap.
> {
> - (exit 0); exit
> + (exit 0); exit 0
> }
>
> # Local variables:
>
>
> -------------------------------------------------------------------------
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job easier
> Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> Audacity-cvs mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/audacity-cvs
>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
