diff --git a/Makefile.am b/Makefile.am index 9a3c404fb..78277c11d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = help images lib-src po src tests ACLOCAL_AMFLAGS = -I m4 +bin_SCRIPTS = audacity$(EXEEXT) + dist_doc_DATA = LICENSE.txt README.txt dist_pkgdata_DATA = presets/EQDefaultCurves.xml @@ -67,3 +69,10 @@ nobase_dist_pkgdata_DATA = \ plug-ins/vocalremover.ny \ plug-ins/vocoder.ny \ $(NULL) + +audacity$(EXEEXT): src/audacity$(EXEEXT) + cp src/audacity$(EXEEXT) audacity$(EXEEXT) + [ -e plug-ins ] || ln -s $(srcdir)/plug-ins + [ -e nyquist ] || ln -s $(srcdir)/nyquist + [ -e locale ] || ln -s po locale +CLEANFILES = audacity$(EXEEXT) plug-ins nyquist locale diff --git a/Makefile.in b/Makefile.in index e1484a11d..3096144c8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -141,33 +142,6 @@ CONFIG_HEADER = $(top_builddir)/src/configwin.h \ $(top_builddir)/src/configunix.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -195,8 +169,36 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" \ - "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" +SCRIPTS = $(bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(dist_doc_DATA) $(dist_pkgdata_DATA) \ $(nobase_dist_pkgdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -482,6 +484,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = help images lib-src po src tests ACLOCAL_AMFLAGS = -I m4 +bin_SCRIPTS = audacity$(EXEEXT) dist_doc_DATA = LICENSE.txt README.txt dist_pkgdata_DATA = presets/EQDefaultCurves.xml nobase_dist_pkgdata_DATA = \ @@ -547,6 +550,7 @@ nobase_dist_pkgdata_DATA = \ plug-ins/vocoder.ny \ $(NULL) +CLEANFILES = audacity$(EXEEXT) plug-ins nyquist locale all: all-recursive .SUFFIXES: @@ -584,6 +588,41 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -948,10 +987,10 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -976,6 +1015,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -1013,7 +1053,7 @@ install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: +install-exec-am: install-binSCRIPTS install-html: install-html-recursive @@ -1053,8 +1093,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_docDATA uninstall-dist_pkgdataDATA \ - uninstall-nobase_dist_pkgdataDATA +uninstall-am: uninstall-binSCRIPTS uninstall-dist_docDATA \ + uninstall-dist_pkgdataDATA uninstall-nobase_dist_pkgdataDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -1065,19 +1105,26 @@ uninstall-am: uninstall-dist_docDATA uninstall-dist_pkgdataDATA \ dist-xz dist-zip distcheck distclean distclean-generic \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_docDATA install-dist_pkgdataDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-nobase_dist_pkgdataDATA install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-dist_docDATA uninstall-dist_pkgdataDATA \ + install install-am install-binSCRIPTS install-data \ + install-data-am install-dist_docDATA install-dist_pkgdataDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nobase_dist_pkgdataDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-dist_docDATA uninstall-dist_pkgdataDATA \ uninstall-nobase_dist_pkgdataDATA +audacity$(EXEEXT): src/audacity$(EXEEXT) + cp src/audacity$(EXEEXT) audacity$(EXEEXT) + [ -e plug-ins ] || ln -s $(srcdir)/plug-ins + [ -e nyquist ] || ln -s $(srcdir)/nyquist + [ -e locale ] || ln -s po locale + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/configure b/configure index 133619260..d59e5e26b 100755 --- a/configure +++ b/configure @@ -22988,7 +22988,7 @@ $as_echo "#define USE_LIBID3TAG 1" >>confdefs.h if test "$LIBMAD_USE_LOCAL" = yes; then - LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad -I../lib-src/libmad' + LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad -I$(top_builddir)/lib-src/libmad' LIBMAD_LIBS='$(top_builddir)/lib-src/libmad/libmad.la' subdirs="$subdirs lib-src/libmad" @@ -23178,7 +23178,7 @@ fi if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes; then - SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include -I../lib-src/soundtouch/include' + SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include -I$(top_builddir)/lib-src/soundtouch/include' SOUNDTOUCH_LIBS='$(top_builddir)/lib-src/soundtouch/source/SoundTouch/.libs/libSoundTouch.a' subdirs="$subdirs lib-src/soundtouch" @@ -23348,7 +23348,7 @@ $as_echo "#define USE_LIBVORBIS 1" >>confdefs.h if test "$LV2_USE_LOCAL" = yes; then - LV2_CFLAGS='-I$(top_srcdir)/lib-src/lv2/include' + LV2_CFLAGS='-I$(top_srcdir)/lib-src/lv2/include -I$(top_builddir)/lib-src/lv2/include' LV2_LIBS='$(top_builddir)/lib-src/lv2/liblv2.a' subdirs="$subdirs lib-src/lv2" @@ -27282,6 +27282,8 @@ fi echo "" echo "Finished configure:" +# Copy the contents of the locale directory to the build directory + ! -e "${ac_abs+top_builddir}/po/LINGUAS" && cp -a "${ac_abs_top_srcdir}/po/"* "${ac_abs_top_builddir}/po/" for lib in $LIBRARIES ; do eval LIB_USE_LOCAL=\$${lib}_USE_LOCAL diff --git a/configure.ac b/configure.ac index 8e11d944e..a191ce5cf 100644 --- a/configure.ac +++ b/configure.ac @@ -735,6 +735,8 @@ AC_OUTPUT echo "" echo "Finished configure:" +# Copy the contents of the locale directory to the build directory +[ ! -e "${ac_abs+top_builddir}/po/LINGUAS" ] && cp -a "${ac_abs_top_srcdir}/po/"* "${ac_abs_top_builddir}/po/" for lib in $LIBRARIES ; do eval LIB_USE_LOCAL=\$${lib}_USE_LOCAL diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt index b047201c8..8ce403020 100644 --- a/lib-src/audacity-patches.txt +++ b/lib-src/audacity-patches.txt @@ -42,6 +42,7 @@ arguments ([-Wall foreign]) added to AM_INIT_AUTOMAKE to avoid autoreconf failures arguments (--no-verify) removed from ltconfig execution to prevent configure failures +Patches: libid3tag-srcdir.patch Adds srcdir handling libmad ------ @@ -90,6 +91,7 @@ Patches: endian.m4, lrint.m4, llrint.m4, lrintf.m4, clip_mode.m4 copied from signal.m4 created out of the tail of acinclude.m4 with the remaining necessary macro autotools.patch: Fix autotools warnings. + libsndfile-srcdir.patch: Add srcdir handling AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds by default Upstream Version: 0.1.8 @@ -186,7 +188,7 @@ Patches: ../portmixer/portaudio.patch add features needed to make portmixer work Integration by upstream in progress. Will need updating as upstream portaudio moves - +portaudio-srcdir.patch Adds srcdir handling portaudio-v19/wasapi-fix.patch Patch to WASAPI hostapi that corrects incorrect reporting of stream open/running/closed state. diff --git a/lib-src/libid3tag/Makefile.am b/lib-src/libid3tag/Makefile.am index 626582426..310722f08 100644 --- a/lib-src/libid3tag/Makefile.am +++ b/lib-src/libid3tag/Makefile.am @@ -95,26 +95,26 @@ EXTRA_libid3tag_la_SOURCES = \ libid3tag_la_LDFLAGS = -version-info $(version_info) -BUILT_SOURCES = frametype.c compat.c genre.dat - -$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am - cd $(srcdir) && \ - gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ - frametype.gperf | \ - sed -e 's/\(struct id3_frametype\);/\1/' | \ - sed -e '/\$$''Id: /s/\$$//g' >frametype.c - -$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am - cd $(srcdir) && \ - gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ - compat.gperf | \ - sed -e 's/\(struct id3_compat\);/\1/' | \ - sed -e '/\$$''Id: /s/\$$//g' >compat.c - -$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am - cd $(srcdir) && \ - sed -n -f genre.dat.sed genre.dat.in | \ - sed -e '/\$$''Id: /s/\$$//g' >genre.dat +#BUILT_SOURCES = frametype.c compat.c genre.dat +# +#$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am +# cd $(srcdir) && \ +# gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ +# frametype.gperf | \ +# sed -e 's/\(struct id3_frametype\);/\1/' | \ +# sed -e '/\$$''Id: /s/\$$//g' >frametype.c +# +#$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am +# cd $(srcdir) && \ +# gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ +# compat.gperf | \ +# sed -e 's/\(struct id3_compat\);/\1/' | \ +# sed -e '/\$$''Id: /s/\$$//g' >compat.c +# +#$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am +# cd $(srcdir) && \ +# sed -n -f genre.dat.sed genre.dat.in | \ +# sed -e '/\$$''Id: /s/\$$//g' >genre.dat libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/lib-src/libid3tag/Makefile.in b/lib-src/libid3tag/Makefile.in index 7a7d515f8..2ad6632f6 100644 --- a/lib-src/libid3tag/Makefile.in +++ b/lib-src/libid3tag/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -415,8 +415,7 @@ EXTRA_libid3tag_la_SOURCES = \ debug.c debug.h libid3tag_la_LDFLAGS = -version-info $(version_info) -BUILT_SOURCES = frametype.c compat.c genre.dat -all: $(BUILT_SOURCES) config.h +all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: @@ -874,16 +873,14 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive +check: check-recursive all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive +install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -913,7 +910,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ @@ -988,8 +984,7 @@ ps-am: uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES -.MAKE: $(am__recursive_targets) all check install install-am \ - install-strip +.MAKE: $(am__recursive_targets) all install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--refresh check check-am clean clean-cscope clean-generic \ @@ -1011,24 +1006,26 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES uninstall-includeHEADERS uninstall-libLTLIBRARIES -$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am - cd $(srcdir) && \ - gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ - frametype.gperf | \ - sed -e 's/\(struct id3_frametype\);/\1/' | \ - sed -e '/\$$''Id: /s/\$$//g' >frametype.c - -$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am - cd $(srcdir) && \ - gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ - compat.gperf | \ - sed -e 's/\(struct id3_compat\);/\1/' | \ - sed -e '/\$$''Id: /s/\$$//g' >compat.c - -$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am - cd $(srcdir) && \ - sed -n -f genre.dat.sed genre.dat.in | \ - sed -e '/\$$''Id: /s/\$$//g' >genre.dat +#BUILT_SOURCES = frametype.c compat.c genre.dat +# +#$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am +# cd $(srcdir) && \ +# gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ +# frametype.gperf | \ +# sed -e 's/\(struct id3_frametype\);/\1/' | \ +# sed -e '/\$$''Id: /s/\$$//g' >frametype.c +# +#$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am +# cd $(srcdir) && \ +# gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ +# compat.gperf | \ +# sed -e 's/\(struct id3_compat\);/\1/' | \ +# sed -e '/\$$''Id: /s/\$$//g' >compat.c +# +#$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am +# cd $(srcdir) && \ +# sed -n -f genre.dat.sed genre.dat.in | \ +# sed -e '/\$$''Id: /s/\$$//g' >genre.dat libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/lib-src/libid3tag/aclocal.m4 b/lib-src/libid3tag/aclocal.m4 index 5921f8cbd..ee88bdb55 100644 --- a/lib-src/libid3tag/aclocal.m4 +++ b/lib-src/libid3tag/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.3])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/lib-src/libid3tag/libid3tag-srcdir.patch b/lib-src/libid3tag/libid3tag-srcdir.patch new file mode 100644 index 000000000..d8b17ff80 --- /dev/null +++ b/lib-src/libid3tag/libid3tag-srcdir.patch @@ -0,0 +1,150 @@ +Index: lib-src/libid3tag/Makefile.am +=================================================================== +--- lib-src/libid3tag/Makefile.am (revision 13510) ++++ lib-src/libid3tag/Makefile.am (working copy) +@@ -95,27 +95,27 @@ + + libid3tag_la_LDFLAGS = -version-info $(version_info) + +-BUILT_SOURCES = frametype.c compat.c genre.dat ++#BUILT_SOURCES = frametype.c compat.c genre.dat ++# ++#$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am ++# cd $(srcdir) && \ ++# gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ ++# frametype.gperf | \ ++# sed -e 's/\(struct id3_frametype\);/\1/' | \ ++# sed -e '/\$$''Id: /s/\$$//g' >frametype.c ++# ++#$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am ++# cd $(srcdir) && \ ++# gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ ++# compat.gperf | \ ++# sed -e 's/\(struct id3_compat\);/\1/' | \ ++# sed -e '/\$$''Id: /s/\$$//g' >compat.c ++# ++#$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am ++# cd $(srcdir) && \ ++# sed -n -f genre.dat.sed genre.dat.in | \ ++# sed -e '/\$$''Id: /s/\$$//g' >genre.dat + +-$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am +- cd $(srcdir) && \ +- gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ +- frametype.gperf | \ +- sed -e 's/\(struct id3_frametype\);/\1/' | \ +- sed -e '/\$$''Id: /s/\$$//g' >frametype.c +- +-$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am +- cd $(srcdir) && \ +- gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ +- compat.gperf | \ +- sed -e 's/\(struct id3_compat\);/\1/' | \ +- sed -e '/\$$''Id: /s/\$$//g' >compat.c +- +-$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am +- cd $(srcdir) && \ +- sed -n -f genre.dat.sed genre.dat.in | \ +- sed -e '/\$$''Id: /s/\$$//g' >genre.dat +- + libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck + +Index: lib-src/libid3tag/Makefile.in +=================================================================== +--- lib-src/libid3tag/Makefile.in (revision 13510) ++++ lib-src/libid3tag/Makefile.in (working copy) +@@ -415,8 +415,7 @@ + debug.c debug.h + + libid3tag_la_LDFLAGS = -version-info $(version_info) +-BUILT_SOURCES = frametype.c compat.c genre.dat +-all: $(BUILT_SOURCES) config.h ++all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +@@ -874,8 +873,7 @@ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 + check-am: all-am +-check: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) check-recursive ++check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h + installdirs: installdirs-recursive + installdirs-am: +@@ -882,8 +880,7 @@ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +-install: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) install-recursive ++install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive + uninstall: uninstall-recursive +@@ -913,7 +910,6 @@ + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-recursive + + clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +@@ -988,8 +984,7 @@ + + uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES + +-.MAKE: $(am__recursive_targets) all check install install-am \ +- install-strip ++.MAKE: $(am__recursive_targets) all install-am install-strip + + .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ +@@ -1011,25 +1006,27 @@ + uninstall-includeHEADERS uninstall-libLTLIBRARIES + + +-$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am +- cd $(srcdir) && \ +- gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ +- frametype.gperf | \ +- sed -e 's/\(struct id3_frametype\);/\1/' | \ +- sed -e '/\$$''Id: /s/\$$//g' >frametype.c ++#BUILT_SOURCES = frametype.c compat.c genre.dat ++# ++#$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am ++# cd $(srcdir) && \ ++# gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ ++# frametype.gperf | \ ++# sed -e 's/\(struct id3_frametype\);/\1/' | \ ++# sed -e '/\$$''Id: /s/\$$//g' >frametype.c ++# ++#$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am ++# cd $(srcdir) && \ ++# gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ ++# compat.gperf | \ ++# sed -e 's/\(struct id3_compat\);/\1/' | \ ++# sed -e '/\$$''Id: /s/\$$//g' >compat.c ++# ++#$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am ++# cd $(srcdir) && \ ++# sed -n -f genre.dat.sed genre.dat.in | \ ++# sed -e '/\$$''Id: /s/\$$//g' >genre.dat + +-$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am +- cd $(srcdir) && \ +- gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ +- compat.gperf | \ +- sed -e 's/\(struct id3_compat\);/\1/' | \ +- sed -e '/\$$''Id: /s/\$$//g' >compat.c +- +-$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am +- cd $(srcdir) && \ +- sed -n -f genre.dat.sed genre.dat.in | \ +- sed -e '/\$$''Id: /s/\$$//g' >genre.dat +- + libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck + diff --git a/lib-src/libid3tag/msvc++/Makefile.in b/lib-src/libid3tag/msvc++/Makefile.in index f36618059..64901a1e0 100644 --- a/lib-src/libid3tag/msvc++/Makefile.in +++ b/lib-src/libid3tag/msvc++/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/M4/Makefile.in b/lib-src/libsndfile/M4/Makefile.in index 432876df6..6c29924a5 100644 --- a/lib-src/libsndfile/M4/Makefile.in +++ b/lib-src/libsndfile/M4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/Makefile.am b/lib-src/libsndfile/Makefile.am index a55716e82..2f1f58ce3 100644 --- a/lib-src/libsndfile/Makefile.am +++ b/lib-src/libsndfile/Makefile.am @@ -8,7 +8,7 @@ if BUILD_OCTAVE_MOD octave_dir = Octave endif -SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs +SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs EXTRA_DIST = libsndfile.spec.in sndfile.pc.in diff --git a/lib-src/libsndfile/Makefile.in b/lib-src/libsndfile/Makefile.in index c487bc2e1..84da67179 100644 --- a/lib-src/libsndfile/Makefile.in +++ b/lib-src/libsndfile/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -412,7 +412,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I M4 DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave -SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs +SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs EXTRA_DIST = libsndfile.spec.in sndfile.pc.in CLEANFILES = *~ diff --git a/lib-src/libsndfile/Octave/Makefile.in b/lib-src/libsndfile/Octave/Makefile.in index 2e78292ec..18bc18576 100644 --- a/lib-src/libsndfile/Octave/Makefile.in +++ b/lib-src/libsndfile/Octave/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/Win32/Makefile.in b/lib-src/libsndfile/Win32/Makefile.in index b1711d2f6..6642da334 100644 --- a/lib-src/libsndfile/Win32/Makefile.in +++ b/lib-src/libsndfile/Win32/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/configure b/lib-src/libsndfile/configure index 41ef9dab7..32c050622 100755 --- a/lib-src/libsndfile/configure +++ b/lib-src/libsndfile/configure @@ -18986,11 +18986,10 @@ $as_echo "$as_me: WARNING: *** sizeof (double) != 8. $as_echo "$as_me: WARNING: ******************************************************************" >&2;} fi -if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Touching files in directory tests/." >&5 -$as_echo "$as_me: WARNING: Touching files in directory tests/." >&2;} - touch tests/*.c tests/*.h - fi +#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then +# AC_MSG_WARN([[Touching files in directory tests/.]]) +# touch tests/*.c tests/*.h +# fi #==================================================================================== # Settings for the HTML documentation. @@ -22427,5 +22426,5 @@ if test x$prefix != "x/usr" ; then echo fi -(cd src && make genfiles) -(cd tests && make genfiles) +#(cd src && make genfiles) +#(cd tests && make genfiles) diff --git a/lib-src/libsndfile/configure.ac b/lib-src/libsndfile/configure.ac index bc44662b5..92dd4ab01 100644 --- a/lib-src/libsndfile/configure.ac +++ b/lib-src/libsndfile/configure.ac @@ -457,10 +457,10 @@ if test $ac_cv_sizeof_double != 8 ; then AC_MSG_WARN([[******************************************************************]]) fi -if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then - AC_MSG_WARN([[Touching files in directory tests/.]]) - touch tests/*.c tests/*.h - fi +#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then +# AC_MSG_WARN([[Touching files in directory tests/.]]) +# touch tests/*.c tests/*.h +# fi #==================================================================================== # Settings for the HTML documentation. @@ -691,5 +691,5 @@ if test x$prefix != "x/usr" ; then echo fi -(cd src && make genfiles) -(cd tests && make genfiles) +#(cd src && make genfiles) +#(cd tests && make genfiles) diff --git a/lib-src/libsndfile/doc/Makefile.in b/lib-src/libsndfile/doc/Makefile.in index 2cd941818..7520f1da4 100644 --- a/lib-src/libsndfile/doc/Makefile.in +++ b/lib-src/libsndfile/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/examples/Makefile.in b/lib-src/libsndfile/examples/Makefile.in index dd64dbd6a..a8faf6eb8 100644 --- a/lib-src/libsndfile/examples/Makefile.in +++ b/lib-src/libsndfile/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/libsndfile-srcdir.patch b/lib-src/libsndfile/libsndfile-srcdir.patch new file mode 100644 index 000000000..878b482c6 --- /dev/null +++ b/lib-src/libsndfile/libsndfile-srcdir.patch @@ -0,0 +1,81 @@ +Index: lib-src/libsndfile/Makefile.am +=================================================================== +--- lib-src/libsndfile/Makefile.am (revision 13510) ++++ lib-src/libsndfile/Makefile.am (working copy) +@@ -8,7 +8,7 @@ + octave_dir = Octave + endif + +-SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs ++SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs + DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs + + EXTRA_DIST = libsndfile.spec.in sndfile.pc.in +Index: lib-src/libsndfile/Makefile.in +=================================================================== +--- lib-src/libsndfile/Makefile.in (revision 13510) ++++ lib-src/libsndfile/Makefile.in (working copy) +@@ -412,7 +412,7 @@ + ACLOCAL_AMFLAGS = -I M4 + DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror + @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave +-SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs ++SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs + DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs + EXTRA_DIST = libsndfile.spec.in sndfile.pc.in + CLEANFILES = *~ +Index: lib-src/libsndfile/configure +=================================================================== +--- lib-src/libsndfile/configure (revision 13510) ++++ lib-src/libsndfile/configure (working copy) +@@ -18986,11 +18986,10 @@ + $as_echo "$as_me: WARNING: ******************************************************************" >&2;} + fi + +-if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Touching files in directory tests/." >&5 +-$as_echo "$as_me: WARNING: Touching files in directory tests/." >&2;} +- touch tests/*.c tests/*.h +- fi ++#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then ++# AC_MSG_WARN([[Touching files in directory tests/.]]) ++# touch tests/*.c tests/*.h ++# fi + + #==================================================================================== + # Settings for the HTML documentation. +@@ -22427,5 +22426,5 @@ + echo + fi + +-(cd src && make genfiles) +-(cd tests && make genfiles) ++#(cd src && make genfiles) ++#(cd tests && make genfiles) +Index: lib-src/libsndfile/configure.ac +=================================================================== +--- lib-src/libsndfile/configure.ac (revision 13510) ++++ lib-src/libsndfile/configure.ac (working copy) +@@ -457,10 +457,10 @@ + AC_MSG_WARN([[******************************************************************]]) + fi + +-if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then +- AC_MSG_WARN([[Touching files in directory tests/.]]) +- touch tests/*.c tests/*.h +- fi ++#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then ++# AC_MSG_WARN([[Touching files in directory tests/.]]) ++# touch tests/*.c tests/*.h ++# fi + + #==================================================================================== + # Settings for the HTML documentation. +@@ -691,5 +691,5 @@ + echo + fi + +-(cd src && make genfiles) +-(cd tests && make genfiles) ++#(cd src && make genfiles) ++#(cd tests && make genfiles) diff --git a/lib-src/libsndfile/man/Makefile.in b/lib-src/libsndfile/man/Makefile.in index a2b0c02d5..03a712881 100644 --- a/lib-src/libsndfile/man/Makefile.in +++ b/lib-src/libsndfile/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/programs/Makefile.in b/lib-src/libsndfile/programs/Makefile.in index 053c1b64f..529c22e8c 100644 --- a/lib-src/libsndfile/programs/Makefile.in +++ b/lib-src/libsndfile/programs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/regtest/Makefile.in b/lib-src/libsndfile/regtest/Makefile.in index 1db73af98..a7244285f 100644 --- a/lib-src/libsndfile/regtest/Makefile.in +++ b/lib-src/libsndfile/regtest/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/src/G72x/Makefile.in b/lib-src/libsndfile/src/G72x/Makefile.in index ab671411f..18a445304 100644 --- a/lib-src/libsndfile/src/G72x/Makefile.in +++ b/lib-src/libsndfile/src/G72x/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/src/GSM610/Makefile.in b/lib-src/libsndfile/src/GSM610/Makefile.in index 236cf8700..7cdd5fb4f 100644 --- a/lib-src/libsndfile/src/GSM610/Makefile.in +++ b/lib-src/libsndfile/src/GSM610/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/src/Makefile.in b/lib-src/libsndfile/src/Makefile.in index f3e51f082..44e815dc4 100644 --- a/lib-src/libsndfile/src/Makefile.in +++ b/lib-src/libsndfile/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/libsndfile/tests/Makefile.in b/lib-src/libsndfile/tests/Makefile.in index 9dd32d261..cca7cd2ab 100644 --- a/lib-src/libsndfile/tests/Makefile.in +++ b/lib-src/libsndfile/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/lv2/Makefile b/lib-src/lv2/Makefile index 5f843504d..20091bc7e 100644 --- a/lib-src/lv2/Makefile +++ b/lib-src/lv2/Makefile @@ -1,5 +1,7 @@ +include srcdir.mk + all: - ./build + ./build --srcdir=$(srcdir) check: diff --git a/lib-src/lv2/build b/lib-src/lv2/build index 06a23158e..ee618bcde 100755 --- a/lib-src/lv2/build +++ b/lib-src/lv2/build @@ -1,5 +1,16 @@ #!/bin/bash +srcdir=. +while [ $# -gt 0 ] +do + if [[ "$1" =~ --srcdir=.* ]] + then + srcdir=${1#*=} + break + fi + shift +done + function waf { pkg=$1 diff --git a/lib-src/lv2/configure b/lib-src/lv2/configure index b1eb23c38..436a64e10 100755 --- a/lib-src/lv2/configure +++ b/lib-src/lv2/configure @@ -1,10 +1,31 @@ #!/bin/bash +srcdir=. +while [ $# -gt 0 ] +do + if [[ "$1" =~ --srcdir=.* ]] + then + srcdir=${1#*=} + break + fi + shift +done + function waf { pkg="$1" shift + mkdir -p ${pkg} pushd >/dev/null ${pkg} + + for f in "../${srcdir}/${pkg}"/* + do + if [ ! -e "${f##*/}" ] + then + ln -s "${f}" + fi + done + $(which python python2 | tail -1) waf --prefix="." --include="." $@ configure || exit 1 popd >/dev/null @@ -40,6 +61,10 @@ EOF rm -rf include mkdir -p include +[ ! -e Makefile ] && ln -s "${srcdir}/Makefile" +[ ! -e build ] && ln -s "${srcdir}/build" +echo >srcdir.mk "srcdir = ${srcdir}" + waf lv2 --no-plugins waf serd --no-utils --static --no-shared waf sord --no-utils --static --no-shared diff --git a/lib-src/portaudio-v19/Makefile.in b/lib-src/portaudio-v19/Makefile.in index f5fc25804..18c2de66e 100644 --- a/lib-src/portaudio-v19/Makefile.in +++ b/lib-src/portaudio-v19/Makefile.in @@ -156,7 +156,10 @@ SRC_DIRS = \ SUBDIRS = @ENABLE_CXX_TRUE@SUBDIRS += bindings/cpp -all: lib/$(PALIB) all-recursive tests examples selftests +prep: + mkdir -p qa/loopback/src/ src/hostapi/skeleton/ $(SRC_DIRS) + +all: prep lib/$(PALIB) all-recursive tests examples selftests tests: bin-stamp $(TESTS) diff --git a/lib-src/portaudio-v19/portaudio-srcdir.patch b/lib-src/portaudio-v19/portaudio-srcdir.patch new file mode 100644 index 000000000..42b0a278c --- /dev/null +++ b/lib-src/portaudio-v19/portaudio-srcdir.patch @@ -0,0 +1,17 @@ +Index: lib-src/portaudio-v19/Makefile.in +=================================================================== +--- lib-src/portaudio-v19/Makefile.in (revision 13510) ++++ lib-src/portaudio-v19/Makefile.in (working copy) +@@ -156,8 +156,11 @@ + SUBDIRS = + @ENABLE_CXX_TRUE@SUBDIRS += bindings/cpp + +-all: lib/$(PALIB) all-recursive tests examples selftests ++prep: ++ mkdir -p qa/loopback/src/ src/hostapi/skeleton/ $(SRC_DIRS) + ++all: prep lib/$(PALIB) all-recursive tests examples selftests ++ + tests: bin-stamp $(TESTS) + + examples: bin-stamp $(EXAMPLES) diff --git a/locale/Makefile.in.in b/locale/Makefile.in.in index 83d8838ac..ccd0fa557 100644 --- a/locale/Makefile.in.in +++ b/locale/Makefile.in.in @@ -18,7 +18,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ SHELL = /bin/sh @SET_MAKE@ -srcdir = @srcdir@ +srcdir = . top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -89,8 +89,10 @@ CATALOGS = @CATALOGS@ @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo - + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo; \ + dir=$$lang/LC_MESSAGES; \ + $(mkdir_p) $$dir && (cd $$dir ; ln -s ../../$${lang}.gmo $(DOMAIN).mo) + .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ diff --git a/m4/audacity_checklib_libmad.m4 b/m4/audacity_checklib_libmad.m4 index fbf247f80..42d126e6a 100644 --- a/m4/audacity_checklib_libmad.m4 +++ b/m4/audacity_checklib_libmad.m4 @@ -48,7 +48,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ AC_DEFUN([AUDACITY_CONFIG_LIBMAD], [ if test "$LIBMAD_USE_LOCAL" = yes; then - LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad -I../lib-src/libmad' + LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad -I$(top_builddir)/lib-src/libmad' LIBMAD_LIBS='$(top_builddir)/lib-src/libmad/libmad.la' AC_CONFIG_SUBDIRS([lib-src/libmad]) fi diff --git a/m4/audacity_checklib_libsoundtouch.m4 b/m4/audacity_checklib_libsoundtouch.m4 index 3eae82b0f..2da101da1 100644 --- a/m4/audacity_checklib_libsoundtouch.m4 +++ b/m4/audacity_checklib_libsoundtouch.m4 @@ -54,7 +54,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [ AC_DEFUN([AUDACITY_CONFIG_LIBSOUNDTOUCH], [ if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes; then - SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include -I../lib-src/soundtouch/include' + SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include -I$(top_builddir)/lib-src/soundtouch/include' SOUNDTOUCH_LIBS='$(top_builddir)/lib-src/soundtouch/source/SoundTouch/.libs/libSoundTouch.a' AC_CONFIG_SUBDIRS([lib-src/soundtouch]) fi diff --git a/m4/audacity_checklib_lv2.m4 b/m4/audacity_checklib_lv2.m4 index ba18542d5..b4bf7ad31 100644 --- a/m4/audacity_checklib_lv2.m4 +++ b/m4/audacity_checklib_lv2.m4 @@ -39,7 +39,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [ AC_DEFUN([AUDACITY_CONFIG_LV2], [ if test "$LV2_USE_LOCAL" = yes; then - LV2_CFLAGS='-I$(top_srcdir)/lib-src/lv2/include' + LV2_CFLAGS='-I$(top_srcdir)/lib-src/lv2/include -I$(top_builddir)/lib-src/lv2/include' LV2_LIBS='$(top_builddir)/lib-src/lv2/liblv2.a' AC_CONFIG_SUBDIRS([lib-src/lv2]) fi diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index d7ad648a8..84bdbf71e 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1110,6 +1110,9 @@ bool AudacityApp::OnInit() wxT(INSTALL_PREFIX)), audacityPathList); + AddUniquePathToPathList(wxString::Format(wxT("./locale")), + audacityPathList); + #endif //__WXGTK__ wxFileName tmpFile; diff --git a/src/Makefile.am b/src/Makefile.am index 2ad507fdf..bc28b6e39 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,4 @@ bin_PROGRAMS = audacity -bin_SCRIPTS = ../audacity$(EXEEXT) desktopdir = $(datadir)/applications desktop_DATA = audacity.desktop @@ -717,7 +716,3 @@ EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \ effects/ScoreAlignDialog.cpp \ effects/ScoreAlignDialog.h \ $(NULL) - -../audacity$(EXEEXT): audacity$(EXEEXT) - cp audacity$(EXEEXT) ../audacity$(EXEEXT) -CLEANFILES = ../audacity$(EXEEXT) diff --git a/src/Makefile.in b/src/Makefile.in index 4cd3c73d1..ad29a9078 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,7 +15,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -268,8 +267,8 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(mimedir)" PROGRAMS = $(bin_PROGRAMS) am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ DirManager.h Dither.cpp Dither.h FileFormats.cpp FileFormats.h \ @@ -751,34 +750,6 @@ audacity_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ audacity_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(audacity_CXXFLAGS) \ $(CXXFLAGS) $(audacity_LDFLAGS) $(LDFLAGS) -o $@ -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -SCRIPTS = $(bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -838,6 +809,33 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(desktop_DATA) $(dist_mime_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)configtemplate.h configtemplate.h @@ -1070,7 +1068,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -bin_SCRIPTS = ../audacity$(EXEEXT) desktopdir = $(datadir)/applications desktop_DATA = audacity.desktop mimedir = $(datarootdir)/mime/packages @@ -1344,7 +1341,6 @@ EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \ effects/ScoreAlignDialog.h \ $(NULL) -CLEANFILES = ../audacity$(EXEEXT) all: configwin.h configunix.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1951,41 +1947,6 @@ effects/VST/audacity-VSTEffect.$(OBJEXT): effects/VST/$(am__dirstamp) \ audacity$(EXEEXT): $(audacity_OBJECTS) $(audacity_DEPENDENCIES) $(EXTRA_audacity_DEPENDENCIES) @rm -f audacity$(EXEEXT) $(AM_V_CXXLD)$(audacity_LINK) $(audacity_OBJECTS) $(audacity_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -6139,10 +6100,9 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) configwin.h \ - configunix.h +all-am: Makefile $(PROGRAMS) $(DATA) configwin.h configunix.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -6167,7 +6127,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -6237,7 +6196,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-exec-am: install-binPROGRAMS install-html: install-html-am @@ -6277,8 +6236,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-desktopDATA uninstall-dist_mimeDATA +uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ + uninstall-dist_mimeDATA .MAKE: all check-am install-am install-strip @@ -6288,22 +6247,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-binSCRIPTS install-data install-data-am \ - install-desktopDATA install-dist_mimeDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-binSCRIPTS \ + install-data install-data-am install-desktopDATA \ + install-dist_mimeDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-desktopDATA uninstall-dist_mimeDATA -../audacity$(EXEEXT): audacity$(EXEEXT) - cp audacity$(EXEEXT) ../audacity$(EXEEXT) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: