aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2014-10-02 23:18:06 +0200
committerJan Engelhardt <jengelh@inai.de>2014-10-02 23:22:43 +0200
commitde816861cb000453991c52896315ae5a65a0fdf7 (patch)
tree4af4473590f8a926e47ae3ab634646fe13061438
parent603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff (diff)
build: put dependency libraries in the right place in Makefiles
Libs must be in _LDADD/_LIBADD and not in _LDFLAGS.
-rw-r--r--src/Makefile.am4
-rw-r--r--src/channel/abis/Makefile.am3
-rw-r--r--tests/osmo-pcap-test/Makefile.am2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b4b58e..ca40152 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,13 +4,13 @@ LIBVERSION=2:0:0
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
SUBDIRS = channel
lib_LTLIBRARIES = libosmonetif.la
-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la
+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
libosmonetif_la_SOURCES = amr.c \
diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am
index e4d93a3..7b744f2 100644
--- a/src/channel/abis/Makefile.am
+++ b/src/channel/abis/Makefile.am
@@ -1,8 +1,9 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
noinst_LTLIBRARIES = libosmonetif-abis.la
libosmonetif_abis_la_SOURCES = ipa_stream_server.c \
ipa_stream_client.c
+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
diff --git a/tests/osmo-pcap-test/Makefile.am b/tests/osmo-pcap-test/Makefile.am
index 0be6fc4..a256005 100644
--- a/tests/osmo-pcap-test/Makefile.am
+++ b/tests/osmo-pcap-test/Makefile.am
@@ -9,6 +9,6 @@ osmo_pcap_test_SOURCES = proto.c \
osmux_test.c \
pcap.c
-osmo_pcap_test_LDFLAGS = -lpcap \
+osmo_pcap_test_LDADD = -lpcap \
-losmocore \
-losmonetif