From 43498b223e82cb14cdd3f8288d48c928b2974248 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Fri, 19 Dec 2014 09:49:57 +0100 Subject: build: Use LDADD to link apps to libraries instead of LDFLAGS This way we can control that they're in the appropriate order since some linkers are pretty picky. Signed-off-by: Sylvain Munaut --- src/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bedaad0..a89e065 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,17 +2,18 @@ SUBDIRS = codec l1 sdr AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMODSP_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) bin_PROGRAMS = gmr1_rx gmr1_gen_mat gmr1_ambe_decode gmr1_rx_SOURCES = gmr1_rx.c gsmtap.c -gmr1_rx_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a \ +gmr1_rx_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a \ $(top_builddir)/src/sdr/libgmr1-sdr.a \ - $(FFTW3F_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) $(FFTW3F_LIBS) gmr1_gen_mat_SOURCES = gmr1_gen_mat.c -gmr1_gen_mat_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a +gmr1_gen_mat_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a \ + $(LIBOSMOCORE_LIBS) gmr1_ambe_decode_SOURCES = gmr1_ambe_decode.c -gmr1_ambe_decode_LDADD = $(top_builddir)/src/codec/libgmr1-codec.a +gmr1_ambe_decode_LDADD = $(top_builddir)/src/codec/libgmr1-codec.a \ + $(LIBOSMOCORE_LIBS) -lm -- cgit v1.2.3