Explicitly link shared libraries against dependent libraries, in response to

Debian bug #179764.  This lets the linker resolve things automagically, and
programs linking with FLAC libs don't need to add any extra linker flags, among
other good things.

http://bugs.debian.org/179764

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index da4e0a4..f5e1870 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -47,5 +47,4 @@ flac_LDADD = \
        $(top_builddir)/src/share/utf8/libutf8.la \
        $(top_builddir)/src/libFLAC/libFLAC.la \
        @OGG_LIBS@ \
-       @LIBICONV@ \
-       -lm
+       @LIBICONV@

diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 077d9e8..a797c94 100644 (file)
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -42,6 +42,7 @@ EXTRA_DIST = \
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
 libFLAC___la_LDFLAGS = -version-info 3:2:1
+libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
 
 libFLAC___la_SOURCES = \
        file_decoder.cpp \

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 01a10c3..d20d489 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -39,7 +39,9 @@ else
 if FLaC__CPU_IA32
 if FLaC__HAS_NASM
 ARCH_SUBDIRS = ia32
-libFLAC_la_LIBADD = ia32/libFLAC-asm.la
+libFLAC_la_LIBADD = -lm ia32/libFLAC-asm.la
+else
+libFLAC_la_LIBADD = -lm
 endif
 endif
 endif
@@ -57,7 +59,6 @@ EXTRA_DIST = \
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
 libFLAC_la_LDFLAGS = -version-info 5:2:1
-
 libFLAC_la_SOURCES = \
        bitbuffer.c \
        bitmath.c \

diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am
index a817dd7..10ba4ad 100644 (file)
--- a/src/libOggFLAC++/Makefile.am
+++ b/src/libOggFLAC++/Makefile.am
@@ -42,6 +42,7 @@ EXTRA_DIST = \
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
 libOggFLAC___la_LDFLAGS = -version-info 0:4:0
+libOggFLAC___la_LIBADD = ../libOggFLAC/libOggFLAC.la
 
 libOggFLAC___la_SOURCES = \
        stream_decoder.cpp \

diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am
index ffb6862..6fa7211 100644 (file)
--- a/src/libOggFLAC/Makefile.am
+++ b/src/libOggFLAC/Makefile.am
@@ -45,7 +45,7 @@ EXTRA_DIST = \
        libOggFLAC_static.dsp \
        libOggFLAC.m4
 
-libOggFLAC_la_LIBADD = @OGG_LIBS@
+libOggFLAC_la_LIBADD = @OGG_LIBS@ ../libFLAC/libFLAC.la
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
 libOggFLAC_la_LDFLAGS = -version-info 1:2:0