Update of /cvsroot/audacity/lib-src/libflac/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7404/lib-src/libflac/src
Modified Files:
Tag: AUDACITY_1_2
Makefile.am Makefile.in
Log Message:
Fix building of libflac.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/lib-src/libflac/src/Makefile.in,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Makefile.in 8 Apr 2006 14:20:40 -0000 1.1.4.2
+++ Makefile.in 11 Nov 2006 23:25:02 -0000 1.1.4.3
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -30,6 +30,9 @@
# it may be distributed under the Xiph.Org license, which is the least
# restrictive of those mentioned above. See the file COPYING.Xiph in this
# distribution.
+
+# modified for Audacity to include only the bare minimum required
+# directories...bloat is bad!
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -50,6 +53,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -58,7 +62,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
@@ -71,10 +75,7 @@
uninstall-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = libFLAC libFLAC++ libOggFLAC libOggFLAC++ share flac \
- metaflac monkeys_audio_utilities plugin_common plugin_xmms \
- plugin_winamp2 test_grabbag test_libFLAC test_libFLAC++ \
- test_libOggFLAC test_libOggFLAC++ test_seeking test_streams
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -213,6 +214,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -241,26 +244,9 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
[EMAIL PROTECTED]@XMMS_DIRS = plugin_xmms
[EMAIL PROTECTED]@OGGFLAC_DIRS = libOggFLAC libOggFLAC++
[EMAIL PROTECTED]@OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
SUBDIRS = \
libFLAC \
- libFLAC++ \
- $(OGGFLAC_DIRS) \
- share \
- flac \
- metaflac \
- monkeys_audio_utilities \
- plugin_common \
- $(XMMS_DIRS) \
- plugin_winamp2 \
- test_grabbag \
- test_libFLAC \
- test_libFLAC++ \
- $(OGGFLAC_TEST_DIRS) \
- test_seeking \
- test_streams
+ libFLAC++
EXTRA_DIST = \
Makefile.lite
@@ -315,7 +301,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -327,7 +319,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -335,7 +327,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -356,7 +354,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -458,12 +456,14 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || mkdir "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="../$(top_distdir)" \
- distdir="../$(distdir)/$$subdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
distdir) \
|| exit 1; \
fi; \
@@ -492,7 +492,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Index: Makefile.am
===================================================================
RCS file: /cvsroot/audacity/lib-src/libflac/src/Makefile.am,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Makefile.am 8 Apr 2006 14:20:40 -0000 1.1.4.2
+++ Makefile.am 11 Nov 2006 23:25:02 -0000 1.1.4.3
@@ -15,32 +15,12 @@
# restrictive of those mentioned above. See the file COPYING.Xiph in this
# distribution.
-if FLaC__HAS_XMMS
-XMMS_DIRS = plugin_xmms
-endif
-
-if FLaC__HAS_OGG
-OGGFLAC_DIRS = libOggFLAC libOggFLAC++
-OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
-endif
+# modified for Audacity to include only the bare minimum required
+# directories...bloat is bad!
SUBDIRS = \
libFLAC \
- libFLAC++ \
- $(OGGFLAC_DIRS) \
- share \
- flac \
- metaflac \
- monkeys_audio_utilities \
- plugin_common \
- $(XMMS_DIRS) \
- plugin_winamp2 \
- test_grabbag \
- test_libFLAC \
- test_libFLAC++ \
- $(OGGFLAC_TEST_DIRS) \
- test_seeking \
- test_streams
+ libFLAC++
EXTRA_DIST = \
Makefile.lite
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
