From 5874644e547d727b9558c837140010af9b9b74ac Mon Sep 17 00:00:00 2001 From: richardash1981 Date: Sun, 19 Feb 2012 17:44:14 +0000 Subject: [PATCH] provide a fix for not distcleaning the flac directory properly, causing stray .deps/ directories from libtool. Use Micheal's manual update to Makefile.am because I don\'t have prehistoric Automake 1.7 available for a clean automatic update. Patch by Micheal Chinen. --- .../libflac-deps-directory-distclean.patch | 21 +++++++++++++++++++ lib-src/libflac/src/Makefile.am | 1 + lib-src/libflac/src/Makefile.in | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 lib-src/libflac/libflac-deps-directory-distclean.patch diff --git a/lib-src/libflac/libflac-deps-directory-distclean.patch b/lib-src/libflac/libflac-deps-directory-distclean.patch new file mode 100644 index 000000000..1cafdcca8 --- /dev/null +++ b/lib-src/libflac/libflac-deps-directory-distclean.patch @@ -0,0 +1,21 @@ +Index: libflac/src/Makefile.in +=================================================================== +--- libflac/src/Makefile.in (revision 11513) ++++ libflac/src/Makefile.in (working copy) +@@ -220,6 +220,7 @@ + + SUBDIRS = \ + libFLAC \ ++ flac \ + share \ + $(CPPLIBS_DIRS) + +@@ -240,7 +241,7 @@ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_SUBDIRS = libFLAC share libFLAC++ ++DIST_SUBDIRS = libFLAC share libFLAC++ flac + all: all-recursive + + .SUFFIXES: diff --git a/lib-src/libflac/src/Makefile.am b/lib-src/libflac/src/Makefile.am index fcbf4d659..e03b24bae 100644 --- a/lib-src/libflac/src/Makefile.am +++ b/lib-src/libflac/src/Makefile.am @@ -25,6 +25,7 @@ endif SUBDIRS = \ libFLAC \ + flac \ share \ $(CPPLIBS_DIRS) diff --git a/lib-src/libflac/src/Makefile.in b/lib-src/libflac/src/Makefile.in index 95e0b84eb..299f0482a 100644 --- a/lib-src/libflac/src/Makefile.in +++ b/lib-src/libflac/src/Makefile.in @@ -220,6 +220,7 @@ target_alias = @target_alias@ SUBDIRS = \ libFLAC \ + flac \ share \ $(CPPLIBS_DIRS) @@ -240,7 +241,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -DIST_SUBDIRS = libFLAC share libFLAC++ +DIST_SUBDIRS = libFLAC share libFLAC++ flac all: all-recursive .SUFFIXES: