Commit e3499073 authored by Matt Zimmerman's avatar Matt Zimmerman
Browse files

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
parent 50346e2a
......@@ -47,5 +47,4 @@ flac_LDADD = \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \
@LIBICONV@ \
-lm
@LIBICONV@
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment