diff --git a/Makefile.in b/Makefile.in index bd22fa392..bcd937dba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -82,10 +82,10 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) $(dist_doc_DATA) \ $(dist_pkgdata_DATA) $(nobase_dist_pkgdata_DATA) ABOUT-NLS \ - autotools/ar-lib autotools/config.guess autotools/config.rpath \ - autotools/config.sub autotools/depcomp autotools/install-sh \ - autotools/missing autotools/ltmain.sh \ - $(top_srcdir)/autotools/ar-lib \ + autotools/ar-lib autotools/compile autotools/config.guess \ + autotools/config.rpath autotools/config.sub autotools/depcomp \ + autotools/install-sh autotools/missing autotools/ltmain.sh \ + $(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \ $(top_srcdir)/autotools/config.guess \ $(top_srcdir)/autotools/config.rpath \ $(top_srcdir)/autotools/config.sub \ @@ -844,10 +844,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -889,9 +895,10 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff --git a/autotools/compile b/autotools/compile new file mode 100755 index 000000000..531136b06 --- /dev/null +++ b/autotools/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# 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-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure b/configure index 43fb2baa2..574ed8dcc 100755 --- a/configure +++ b/configure @@ -2914,7 +2914,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3451,6 +3451,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -4651,6 +4692,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -7400,6 +7500,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -8056,7 +8215,6 @@ CFLAGS="$cflags_save" CPPFLAGS="$cppflags_save" CXXFLAGS="$cxxflags_save" - if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" do @@ -8164,12 +8322,18 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; } if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 (eval $am_ar_try) 2>&5 @@ -8195,6 +8359,11 @@ if ac_fn_cxx_try_compile "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -9607,6 +9776,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + if test -n "$ac_tool_prefix"; then for ac_prog in ar do diff --git a/help/Makefile.in b/help/Makefile.in index f7330e759..df6006f09 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/images/Makefile.in b/images/Makefile.in index 6d495d37a..5d34f7622 100644 --- a/images/Makefile.in +++ b/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -414,7 +414,66 @@ dist_pixmap_DATA = \ $(NULL) pixmap_DATA = icons/48x48/audacity.xpm -EXTRA_DIST = AudacityLogo48x48.xpm +EXTRA_DIST = \ + Cursors16/DisabledCursor.xpm \ + Cursors16/DrawCursor.xpm \ + Cursors16/EnvCursor.xpm \ + Cursors16/IBeamCursor.xpm \ + Cursors16/LabelCursorLeft.xpm \ + Cursors16/LabelCursorRight.xpm \ + Cursors16/StretchCursor.xpm \ + Cursors16/StretchLeftCursor.xpm \ + Cursors16/StretchRightCursor.xpm \ + Cursors16/TimeCursor.xpm \ + Cursors16/ZoomInCursor.xpm \ + Cursors16/ZoomOutCursor.xpm \ + Cursors32/DisabledCursor.xpm \ + Cursors32/DrawCursor.xpm \ + Cursors32/EnvCursor.xpm \ + Cursors32/IBeamCursor.xpm \ + Cursors32/LabelCursorLeft.xpm \ + Cursors32/LabelCursorRight.xpm \ + Cursors32/StretchCursor.xpm \ + Cursors32/StretchLeftCursor.xpm \ + Cursors32/StretchRightCursor.xpm \ + Cursors32/TimeCursor.xpm \ + Cursors32/ZoomInCursor.xpm \ + Cursors32/ZoomOutCursor.xpm \ + MusicalInstruments/acoustic_guitar_gtr.xpm \ + MusicalInstruments/acoustic_piano_pno.xpm \ + MusicalInstruments/back_vocal_bg_vox.xpm \ + MusicalInstruments/clap.xpm \ + MusicalInstruments/drums_dr.xpm \ + MusicalInstruments/_default_instrument.xpm \ + MusicalInstruments/electric_bass_guitar_bs_gtr.xpm \ + MusicalInstruments/electric_guitar_gtr.xpm \ + MusicalInstruments/electric_piano_pno_key.xpm \ + MusicalInstruments/kick.xpm \ + MusicalInstruments/loop.xpm \ + MusicalInstruments/organ_org.xpm \ + MusicalInstruments/perc.xpm \ + MusicalInstruments/sax.xpm \ + MusicalInstruments/snare.xpm \ + MusicalInstruments/string_violin_cello.xpm \ + MusicalInstruments/synth.xpm \ + MusicalInstruments/tambo.xpm \ + MusicalInstruments/trumpet_horn.xpm \ + MusicalInstruments/turntable.xpm \ + MusicalInstruments/vibraphone_vibes.xpm \ + MusicalInstruments/vocal_vox.xpm \ + Arrow.xpm \ + AudacityLogo48x48.xpm \ + AudacityLogoAlpha.xpm \ + AudacityLogoWithName.xpm \ + Cursors.h \ + MusicalInstruments.h \ + SliderThumbAlpha.xpm \ + SliderThumbDisabled.xpm \ + SliderThumb_Vertical.xpm \ + SliderThumb_VerticalAlpha.xpm \ + SliderThumb_VerticalDisabled.xpm \ + $(NULL) + CLEANFILES = icons/48x48/audacity.xpm all: all-am diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index e80e48237..f232622a5 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -80,36 +80,19 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/dist-libsoxr.mk $(srcdir)/dist-libvamp.mk \ $(srcdir)/dist-portaudio.mk $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_EXPAT_TRUE@am__append_1 = expat - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBID3TAG_TRUE@am__append_2 = libid3tag - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBMAD_TRUE@am__append_3 = libmad @USE_LOCAL_LIBNYQUIST_TRUE@am__append_4 = libnyquist @USE_LOCAL_LIBRESAMPLE_TRUE@am__append_5 = libresample - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBSAMPLERATE_TRUE@am__append_6 = libsamplerate - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBSNDFILE_TRUE@am__append_7 = libsndfile - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBSOUNDTOUCH_TRUE@am__append_8 = soundtouch @USE_LOCAL_LIBSOXR_TRUE@am__append_9 = libsoxr - -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBTWOLAME_TRUE@am__append_10 = twolame - -# Note: These libraries will not be distributed in the source tarball. @USE_LOCAL_LIBVORBIS_TRUE@am__append_11 = libogg libvorbis # Note: libflac needs to be linked against (the local or system) libogg. -# Note: This library will not be distributed in the source tarball. @USE_LOCAL_LIBFLAC_TRUE@am__append_12 = libflac @USE_LOCAL_LV2_TRUE@am__append_13 = lv2 @USE_LOCAL_PORTAUDIO_TRUE@am__append_14 = portaudio-v19 @@ -455,14 +438,42 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Distribute patches -EXTRA_DIST = ffmpeg/libavcodec/avcodec.h ffmpeg/libavformat/avformat.h \ - ffmpeg/libavformat/avio.h ffmpeg/libavutil/attributes.h \ - ffmpeg/libavutil/avconfig.h ffmpeg/libavutil/avutil.h \ - ffmpeg/libavutil/common.h ffmpeg/libavutil/error.h \ - ffmpeg/libavutil/fifo.h ffmpeg/libavutil/intfloat_readwrite.h \ - ffmpeg/libavutil/log.h ffmpeg/libavutil/mathematics.h \ - ffmpeg/libavutil/mem.h ffmpeg/libavutil/pixfmt.h \ - ffmpeg/libavutil/rational.h ffmpeg/win32/inttypes.h \ +EXTRA_DIST = ffmpeg/libavcodec/avcodec.h ffmpeg/libavcodec/avfft.h \ + ffmpeg/libavcodec/dxva2.h ffmpeg/libavcodec/old_codec_ids.h \ + ffmpeg/libavcodec/vaapi.h ffmpeg/libavcodec/vda.h \ + ffmpeg/libavcodec/vdpau.h ffmpeg/libavcodec/version.h \ + ffmpeg/libavcodec/xvmc.h ffmpeg/libavformat/avformat.h \ + ffmpeg/libavformat/avio.h ffmpeg/libavformat/version.h \ + ffmpeg/libavutil/adler32.h ffmpeg/libavutil/aes.h \ + ffmpeg/libavutil/attributes.h ffmpeg/libavutil/audioconvert.h \ + ffmpeg/libavutil/audio_fifo.h ffmpeg/libavutil/avassert.h \ + ffmpeg/libavutil/avconfig.h ffmpeg/libavutil/avstring.h \ + ffmpeg/libavutil/avutil.h ffmpeg/libavutil/base64.h \ + ffmpeg/libavutil/blowfish.h ffmpeg/libavutil/bprint.h \ + ffmpeg/libavutil/bswap.h ffmpeg/libavutil/buffer.h \ + ffmpeg/libavutil/channel_layout.h ffmpeg/libavutil/common.h \ + ffmpeg/libavutil/cpu.h ffmpeg/libavutil/crc.h \ + ffmpeg/libavutil/dict.h ffmpeg/libavutil/downmix_info.h \ + ffmpeg/libavutil/error.h ffmpeg/libavutil/eval.h \ + ffmpeg/libavutil/ffversion.h ffmpeg/libavutil/fifo.h \ + ffmpeg/libavutil/file.h ffmpeg/libavutil/frame.h \ + ffmpeg/libavutil/hmac.h ffmpeg/libavutil/imgutils.h \ + ffmpeg/libavutil/intfloat.h \ + ffmpeg/libavutil/intfloat_readwrite.h \ + ffmpeg/libavutil/intreadwrite.h ffmpeg/libavutil/lfg.h \ + ffmpeg/libavutil/log.h ffmpeg/libavutil/lzo.h \ + ffmpeg/libavutil/macros.h ffmpeg/libavutil/mathematics.h \ + ffmpeg/libavutil/md5.h ffmpeg/libavutil/mem.h \ + ffmpeg/libavutil/murmur3.h ffmpeg/libavutil/old_pix_fmts.h \ + ffmpeg/libavutil/opencl.h ffmpeg/libavutil/opt.h \ + ffmpeg/libavutil/parseutils.h ffmpeg/libavutil/pixdesc.h \ + ffmpeg/libavutil/pixfmt.h ffmpeg/libavutil/random_seed.h \ + ffmpeg/libavutil/rational.h ffmpeg/libavutil/ripemd.h \ + ffmpeg/libavutil/samplefmt.h ffmpeg/libavutil/sha512.h \ + ffmpeg/libavutil/sha.h ffmpeg/libavutil/stereo3d.h \ + ffmpeg/libavutil/timecode.h ffmpeg/libavutil/time.h \ + ffmpeg/libavutil/timestamp.h ffmpeg/libavutil/version.h \ + ffmpeg/libavutil/xtea.h ffmpeg/win32/inttypes.h \ ffmpeg/win32/stdint.h lame/lame/lame.h $(NULL) \ portsmf/autotools.patch portsmf/autotools-fix-make-dist.patch \ sbsms/autotools.patch sbsms/autotools-fix-make-dist.patch \ @@ -930,18 +941,19 @@ DIST_SUBDIRS = \ $(NULL) -# TODO: Distribute these libraries that do not use Automake: -# libresample # TODO: Check and distribute these directories: # libscorealign, mod-null, mod-nyq-bench, mod-script-pipe, mod-track-panel, portmidi # Note: portmixer needs to be linked against (the local or system) portaudio. -SUBDIRS = FileDialog $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) $(am__append_6) \ - $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) $(am__append_14) portmixer $(am__append_15) \ - $(am__append_16) $(am__append_17) $(am__append_18) + +# Note: These optional libraries will not be distributed in the source tarball. +SUBDIRS = FileDialog $(am__append_4) $(am__append_9) $(am__append_13) \ + $(am__append_14) portmixer $(am__append_15) $(am__append_16) \ + $(am__append_17) $(am__append_18) $(OPTIONAL_SUBDIRS) +OPTIONAL_SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_5) $(am__append_6) $(am__append_7) \ + $(am__append_8) $(am__append_10) $(am__append_11) \ + $(am__append_12) all: all-recursive .SUFFIXES: diff --git a/src/Makefile.in b/src/Makefile.in index e701c40bf..6d4b1a3af 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -298,13 +298,14 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ PlatformCompatibility.cpp PlatformCompatibility.h \ PluginManager.cpp PluginManager.h Printing.cpp Printing.h \ Profiler.cpp Profiler.h Project.cpp Project.h RealFFTf.cpp \ - RealFFTf.h Resample.cpp Resample.h RingBuffer.cpp RingBuffer.h \ - Screenshot.cpp Screenshot.h Shuttle.cpp Shuttle.h \ - ShuttleGui.cpp ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h \ - Snap.cpp Snap.h SoundActivatedRecord.cpp \ - SoundActivatedRecord.h Spectrum.cpp Spectrum.h \ - SplashDialog.cpp SplashDialog.h Tags.cpp Tags.h Theme.cpp \ - Theme.h ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ + RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h Resample.cpp \ + Resample.h RingBuffer.cpp RingBuffer.h Screenshot.cpp \ + Screenshot.h Shuttle.cpp Shuttle.h ShuttleGui.cpp ShuttleGui.h \ + ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ + SoundActivatedRecord.cpp SoundActivatedRecord.h Spectrum.cpp \ + Spectrum.h SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ + SseMathFuncs.h Tags.cpp Tags.h Theme.cpp Theme.h \ + ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \ TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \ @@ -354,6 +355,7 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ effects/EffectCategory.cpp effects/EffectCategory.h \ effects/EffectManager.cpp effects/EffectManager.h \ effects/Equalization.cpp effects/Equalization.h \ + effects/Equalization48x.cpp effects/Equalization48x.h \ effects/Fade.cpp effects/Fade.h effects/FindClipping.cpp \ effects/FindClipping.h effects/Generator.cpp \ effects/Generator.h effects/Invert.cpp effects/Invert.h \ @@ -530,14 +532,15 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ audacity-PlatformCompatibility.$(OBJEXT) \ audacity-PluginManager.$(OBJEXT) audacity-Printing.$(OBJEXT) \ audacity-Profiler.$(OBJEXT) audacity-Project.$(OBJEXT) \ - audacity-RealFFTf.$(OBJEXT) audacity-Resample.$(OBJEXT) \ - audacity-RingBuffer.$(OBJEXT) audacity-Screenshot.$(OBJEXT) \ - audacity-Shuttle.$(OBJEXT) audacity-ShuttleGui.$(OBJEXT) \ - audacity-ShuttlePrefs.$(OBJEXT) audacity-Snap.$(OBJEXT) \ + audacity-RealFFTf.$(OBJEXT) audacity-RealFFTf48x.$(OBJEXT) \ + audacity-Resample.$(OBJEXT) audacity-RingBuffer.$(OBJEXT) \ + audacity-Screenshot.$(OBJEXT) audacity-Shuttle.$(OBJEXT) \ + audacity-ShuttleGui.$(OBJEXT) audacity-ShuttlePrefs.$(OBJEXT) \ + audacity-Snap.$(OBJEXT) \ audacity-SoundActivatedRecord.$(OBJEXT) \ audacity-Spectrum.$(OBJEXT) audacity-SplashDialog.$(OBJEXT) \ - audacity-Tags.$(OBJEXT) audacity-Theme.$(OBJEXT) \ - audacity-TimeDialog.$(OBJEXT) \ + audacity-SseMathFuncs.$(OBJEXT) audacity-Tags.$(OBJEXT) \ + audacity-Theme.$(OBJEXT) audacity-TimeDialog.$(OBJEXT) \ audacity-TimerRecordDialog.$(OBJEXT) \ audacity-TimeTrack.$(OBJEXT) audacity-Track.$(OBJEXT) \ audacity-TrackArtist.$(OBJEXT) audacity-TrackPanel.$(OBJEXT) \ @@ -586,6 +589,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ effects/audacity-EffectCategory.$(OBJEXT) \ effects/audacity-EffectManager.$(OBJEXT) \ effects/audacity-Equalization.$(OBJEXT) \ + effects/audacity-Equalization48x.$(OBJEXT) \ effects/audacity-Fade.$(OBJEXT) \ effects/audacity-FindClipping.$(OBJEXT) \ effects/audacity-Generator.$(OBJEXT) \ @@ -1127,13 +1131,14 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ PlatformCompatibility.cpp PlatformCompatibility.h \ PluginManager.cpp PluginManager.h Printing.cpp Printing.h \ Profiler.cpp Profiler.h Project.cpp Project.h RealFFTf.cpp \ - RealFFTf.h Resample.cpp Resample.h RingBuffer.cpp RingBuffer.h \ - Screenshot.cpp Screenshot.h Shuttle.cpp Shuttle.h \ - ShuttleGui.cpp ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h \ - Snap.cpp Snap.h SoundActivatedRecord.cpp \ - SoundActivatedRecord.h Spectrum.cpp Spectrum.h \ - SplashDialog.cpp SplashDialog.h Tags.cpp Tags.h Theme.cpp \ - Theme.h ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ + RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h Resample.cpp \ + Resample.h RingBuffer.cpp RingBuffer.h Screenshot.cpp \ + Screenshot.h Shuttle.cpp Shuttle.h ShuttleGui.cpp ShuttleGui.h \ + ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ + SoundActivatedRecord.cpp SoundActivatedRecord.h Spectrum.cpp \ + Spectrum.h SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ + SseMathFuncs.h Tags.cpp Tags.h Theme.cpp Theme.h \ + ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \ TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \ @@ -1183,6 +1188,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ effects/EffectCategory.cpp effects/EffectCategory.h \ effects/EffectManager.cpp effects/EffectManager.h \ effects/Equalization.cpp effects/Equalization.h \ + effects/Equalization48x.cpp effects/Equalization48x.h \ effects/Fade.cpp effects/Fade.h effects/FindClipping.cpp \ effects/FindClipping.h effects/Generator.cpp \ effects/Generator.h effects/Invert.cpp effects/Invert.h \ @@ -1286,12 +1292,8 @@ EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \ AudacityHeaders.h \ CrossFade.cpp \ CrossFade.h \ - GStreamerLoader.cpp \ - GStreamerLoader.h \ effects/ScoreAlignDialog.cpp \ effects/ScoreAlignDialog.h \ - import/ImportGStreamer.cpp \ - import/ImportGStreamer.h \ $(NULL) all: configwin.h configunix.h @@ -1331,8 +1333,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): configwin.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/configtemplate.h $(top_builddir)/config.status @rm -f stamp-h1 @@ -1343,8 +1345,8 @@ $(srcdir)/configtemplate.h: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) touch $@ configunix.h: stamp-h2 - @if test ! -f $@; then rm -f stamp-h2; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi + @test -f $@ || rm -f stamp-h2 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2 stamp-h2: $(srcdir)/configtemplate.h $(top_builddir)/config.status @rm -f stamp-h2 @@ -1557,6 +1559,8 @@ effects/audacity-EffectManager.$(OBJEXT): effects/$(am__dirstamp) \ effects/$(DEPDIR)/$(am__dirstamp) effects/audacity-Equalization.$(OBJEXT): effects/$(am__dirstamp) \ effects/$(DEPDIR)/$(am__dirstamp) +effects/audacity-Equalization48x.$(OBJEXT): effects/$(am__dirstamp) \ + effects/$(DEPDIR)/$(am__dirstamp) effects/audacity-Fade.$(OBJEXT): effects/$(am__dirstamp) \ effects/$(DEPDIR)/$(am__dirstamp) effects/audacity-FindClipping.$(OBJEXT): effects/$(am__dirstamp) \ @@ -1962,6 +1966,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Profiler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Project.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-RealFFTf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-RealFFTf48x.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Resample.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-RingBuffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-SampleFormat.Po@am__quote@ @@ -1974,6 +1979,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-SoundActivatedRecord.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Spectrum.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-SplashDialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-SseMathFuncs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Tags.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Theme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TimeDialog.Po@am__quote@ @@ -2052,6 +2058,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-EffectCategory.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-EffectManager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Equalization.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Equalization48x.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Fade.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-FindClipping.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Generator.Po@am__quote@ @@ -3126,6 +3133,20 @@ audacity-RealFFTf.obj: RealFFTf.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-RealFFTf.obj `if test -f 'RealFFTf.cpp'; then $(CYGPATH_W) 'RealFFTf.cpp'; else $(CYGPATH_W) '$(srcdir)/RealFFTf.cpp'; fi` +audacity-RealFFTf48x.o: RealFFTf48x.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-RealFFTf48x.o -MD -MP -MF $(DEPDIR)/audacity-RealFFTf48x.Tpo -c -o audacity-RealFFTf48x.o `test -f 'RealFFTf48x.cpp' || echo '$(srcdir)/'`RealFFTf48x.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-RealFFTf48x.Tpo $(DEPDIR)/audacity-RealFFTf48x.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='RealFFTf48x.cpp' object='audacity-RealFFTf48x.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-RealFFTf48x.o `test -f 'RealFFTf48x.cpp' || echo '$(srcdir)/'`RealFFTf48x.cpp + +audacity-RealFFTf48x.obj: RealFFTf48x.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-RealFFTf48x.obj -MD -MP -MF $(DEPDIR)/audacity-RealFFTf48x.Tpo -c -o audacity-RealFFTf48x.obj `if test -f 'RealFFTf48x.cpp'; then $(CYGPATH_W) 'RealFFTf48x.cpp'; else $(CYGPATH_W) '$(srcdir)/RealFFTf48x.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-RealFFTf48x.Tpo $(DEPDIR)/audacity-RealFFTf48x.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='RealFFTf48x.cpp' object='audacity-RealFFTf48x.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-RealFFTf48x.obj `if test -f 'RealFFTf48x.cpp'; then $(CYGPATH_W) 'RealFFTf48x.cpp'; else $(CYGPATH_W) '$(srcdir)/RealFFTf48x.cpp'; fi` + audacity-Resample.o: Resample.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-Resample.o -MD -MP -MF $(DEPDIR)/audacity-Resample.Tpo -c -o audacity-Resample.o `test -f 'Resample.cpp' || echo '$(srcdir)/'`Resample.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-Resample.Tpo $(DEPDIR)/audacity-Resample.Po @@ -3266,6 +3287,20 @@ audacity-SplashDialog.obj: SplashDialog.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-SplashDialog.obj `if test -f 'SplashDialog.cpp'; then $(CYGPATH_W) 'SplashDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/SplashDialog.cpp'; fi` +audacity-SseMathFuncs.o: SseMathFuncs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-SseMathFuncs.o -MD -MP -MF $(DEPDIR)/audacity-SseMathFuncs.Tpo -c -o audacity-SseMathFuncs.o `test -f 'SseMathFuncs.cpp' || echo '$(srcdir)/'`SseMathFuncs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-SseMathFuncs.Tpo $(DEPDIR)/audacity-SseMathFuncs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SseMathFuncs.cpp' object='audacity-SseMathFuncs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-SseMathFuncs.o `test -f 'SseMathFuncs.cpp' || echo '$(srcdir)/'`SseMathFuncs.cpp + +audacity-SseMathFuncs.obj: SseMathFuncs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-SseMathFuncs.obj -MD -MP -MF $(DEPDIR)/audacity-SseMathFuncs.Tpo -c -o audacity-SseMathFuncs.obj `if test -f 'SseMathFuncs.cpp'; then $(CYGPATH_W) 'SseMathFuncs.cpp'; else $(CYGPATH_W) '$(srcdir)/SseMathFuncs.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-SseMathFuncs.Tpo $(DEPDIR)/audacity-SseMathFuncs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SseMathFuncs.cpp' object='audacity-SseMathFuncs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-SseMathFuncs.obj `if test -f 'SseMathFuncs.cpp'; then $(CYGPATH_W) 'SseMathFuncs.cpp'; else $(CYGPATH_W) '$(srcdir)/SseMathFuncs.cpp'; fi` + audacity-Tags.o: Tags.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-Tags.o -MD -MP -MF $(DEPDIR)/audacity-Tags.Tpo -c -o audacity-Tags.o `test -f 'Tags.cpp' || echo '$(srcdir)/'`Tags.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-Tags.Tpo $(DEPDIR)/audacity-Tags.Po @@ -4050,6 +4085,20 @@ effects/audacity-Equalization.obj: effects/Equalization.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o effects/audacity-Equalization.obj `if test -f 'effects/Equalization.cpp'; then $(CYGPATH_W) 'effects/Equalization.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/Equalization.cpp'; fi` +effects/audacity-Equalization48x.o: effects/Equalization48x.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects/audacity-Equalization48x.o -MD -MP -MF effects/$(DEPDIR)/audacity-Equalization48x.Tpo -c -o effects/audacity-Equalization48x.o `test -f 'effects/Equalization48x.cpp' || echo '$(srcdir)/'`effects/Equalization48x.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) effects/$(DEPDIR)/audacity-Equalization48x.Tpo effects/$(DEPDIR)/audacity-Equalization48x.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='effects/Equalization48x.cpp' object='effects/audacity-Equalization48x.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o effects/audacity-Equalization48x.o `test -f 'effects/Equalization48x.cpp' || echo '$(srcdir)/'`effects/Equalization48x.cpp + +effects/audacity-Equalization48x.obj: effects/Equalization48x.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects/audacity-Equalization48x.obj -MD -MP -MF effects/$(DEPDIR)/audacity-Equalization48x.Tpo -c -o effects/audacity-Equalization48x.obj `if test -f 'effects/Equalization48x.cpp'; then $(CYGPATH_W) 'effects/Equalization48x.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/Equalization48x.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) effects/$(DEPDIR)/audacity-Equalization48x.Tpo effects/$(DEPDIR)/audacity-Equalization48x.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='effects/Equalization48x.cpp' object='effects/audacity-Equalization48x.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o effects/audacity-Equalization48x.obj `if test -f 'effects/Equalization48x.cpp'; then $(CYGPATH_W) 'effects/Equalization48x.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/Equalization48x.cpp'; fi` + effects/audacity-Fade.o: effects/Fade.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects/audacity-Fade.o -MD -MP -MF effects/$(DEPDIR)/audacity-Fade.Tpo -c -o effects/audacity-Fade.o `test -f 'effects/Fade.cpp' || echo '$(srcdir)/'`effects/Fade.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) effects/$(DEPDIR)/audacity-Fade.Tpo effects/$(DEPDIR)/audacity-Fade.Po diff --git a/tests/Makefile.in b/tests/Makefile.in index 5ebdc9196..7de51d383 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc.