move placement of -lm ala Christian

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 21be192..71cd991 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -29,10 +29,4 @@ flac_SOURCES = \
        encode.h \
        file.h
 
-if FLaC__HAS_OGG
-flac_LDFLAGS = -lm
-else
-flac_LDFLAGS = -lm -logg
-endif
-
-flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
+flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm

diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index 6dfa8eb..10bee68 100644 (file)
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -20,6 +20,6 @@ CFLAGS = @CFLAGS@
 noinst_PROGRAMS = test_streams
 test_streams_SOURCES = \
        main.c
-test_streams_LDFLAGS = -lm
+test_streams_LDADD = -lm
 
 CLEANFILES = $(wildcard *.raw)

diff --git a/src/test_unit/Makefile.am b/src/test_unit/Makefile.am
index b3ca0dd..78b418a 100644 (file)
--- a/src/test_unit/Makefile.am
+++ b/src/test_unit/Makefile.am
@@ -19,8 +19,7 @@ CFLAGS = @CFLAGS@
 INCLUDES = -I$(top_srcdir)/src/libFLAC/include
 
 noinst_PROGRAMS = test_unit
-test_unit_LDFLAGS = -lm
-test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
+test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
 test_unit_SOURCES = \
        bitbuffer.c \
        main.c \