Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-11 23:25:53 +01:00
Code Issues Releases Wiki Activity

2nd attempt to Add the ability to build without trashing the source tree

Browse Source 
In r13510 I had neglected to build with all local libraries and some of
them needed attention.

So, I also took the opportunity to work out the locale directory and
how to keep it unmolested as well.  As a result, all locales are rebuilt
as expected, but into the "build" directory.

As a bonus you may now test Audacity from the "build" directory and have
Nyquist plugins and message catalogs available (so you can test other 
languages again without havint to install).

So, again:

mkdir buildme
cd buildme
../configure
make
./audacity
This commit is contained in:
lllucius@gmail.com
2014-10-27 23:13:03 +00:00
parent f0b3367a8a
commit 49ce8fd212
39 changed files with 531 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib-src/libid3tag/Makefile.am
View File

@@ -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

53
lib-src/libid3tag/Makefile.in
View File

@@ -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

6
lib-src/libid3tag/aclocal.m4 vendored
View File

@@ -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]))])

150
lib-src/libid3tag/libid3tag-srcdir.patch Normal file
View File

@@ -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

2
lib-src/libid3tag/msvc++/Makefile.in
View File

@@ -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.