Ensure AM_LDFLAGS is used consistently

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>

diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 6bd1657..12dfe69 100644 (file)
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST = \
        libFLAC++.m4
 
 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
-libFLAC___la_LDFLAGS = -version-info 9:0:3 @LT_NO_UNDEFINED@
+libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -version-info 9:0:3 @LT_NO_UNDEFINED@
 libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
 
 libFLAC___la_SOURCES = \

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index aa0b8b6..84eadb9 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -112,7 +112,7 @@ extra_ogg_sources = \
 endif
 
 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@
+libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@
 
 libFLAC_sources = \
        bitmath.c \

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index bd54356..35460b1 100644 (file)
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -39,7 +39,7 @@ metaflac_SOURCES = \
        options.h \
        usage.h \
        utils.h
-metaflac_LDFLAGS =
+metaflac_LDFLAGS = $(AM_LDFLAGS)
 
 metaflac_LDADD = \
        $(top_builddir)/src/share/grabbag/libgrabbag.la \