Move additional libraries to appropriate place

According to
https://www.gnu.org/software/automake/manual/automake.html#Libtool-Flags
the libraries supposed to be added to *_LDADD or *_LIBADD
while *_LDFLAGS should contain additional libtool linking
flags. Previously we used both. Let's unify this and move all the
libraries into proper automake variable. While at it - also add
libosmocore.la for tests to LDADD since all the tests link against it
anyway.

Change-Id: Ia657a66db75df831421af5df1175a992da5ba80f

6 files changed, 12 insertions, 12 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index cff5f449..e7f94cef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,11 +44,11 @@ endif
 BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c
 EXTRA_DIST = conv_acc_sse_impl.h
 
+libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
+
 if ENABLE_PLUGIN
 libosmocore_la_SOURCES += plugin.c
-libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) $(TALLOC_LIBS) $(LIBRARY_DL) -no-undefined
-else
-libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) $(TALLOC_LIBS) -no-undefined
+libosmocore_la_LIBADD += $(LIBRARY_DL)
 endif
 
 if ENABLE_MSGFILE
diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am
index 8e10c6bc..2bda5b71 100644
--- a/src/ctrl/Makefile.am
+++ b/src/ctrl/Makefile.am
@@ -10,8 +10,8 @@ lib_LTLIBRARIES = libosmoctrl.la
 
 libosmoctrl_la_SOURCES = control_cmd.c control_if.c fsm_ctrl_commands.c
 
-libosmoctrl_la_LDFLAGS = $(LTLDFLAGS_OSMOCTRL) $(TALLOC_LIBS) -version-info $(LIBVERSION) -no-undefined
-libosmoctrl_la_LIBADD = \
+libosmoctrl_la_LDFLAGS = $(LTLDFLAGS_OSMOCTRL) -version-info $(LIBVERSION) -no-undefined
+libosmoctrl_la_LIBADD = $(TALLOC_LIBS) \
 	$(top_builddir)/src/libosmocore.la \
 	$(top_builddir)/src/gsm/libosmogsm.la \
 	$(top_builddir)/src/vty/libosmovty.la
diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am
index 199e16e9..1e0aa1e1 100644
--- a/src/gb/Makefile.am
+++ b/src/gb/Makefile.am
@@ -11,8 +11,8 @@ noinst_HEADERS = common_vty.h
 if ENABLE_GB
 lib_LTLIBRARIES = libosmogb.la
 
-libosmogb_la_LDFLAGS = $(LTLDFLAGS_OSMOGB) -version-info $(LIBVERSION) $(TALLOC_LIBS)
-libosmogb_la_LIBADD = \
+libosmogb_la_LDFLAGS = $(LTLDFLAGS_OSMOGB) -version-info $(LIBVERSION)
+libosmogb_la_LIBADD = $(TALLOC_LIBS) \
 		$(top_builddir)/src/libosmocore.la \
 		$(top_builddir)/src/vty/libosmovty.la \
 		$(top_builddir)/src/gsm/libosmogsm.la
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 9b52f035..44769713 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -35,8 +35,8 @@ libgsmint_la_LDFLAGS = -no-undefined
 libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la
 
 libosmogsm_la_SOURCES =
-libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined $(TALLOC_LIBS)
-libosmogsm_la_LIBADD = libgsmint.la
+libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
+libosmogsm_la_LIBADD = libgsmint.la $(TALLOC_LIBS)
 
 EXTRA_DIST = libosmogsm.map
 
diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am
index 9590d6c1..869e12db 100644
--- a/src/sim/Makefile.am
+++ b/src/sim/Makefile.am
@@ -5,7 +5,7 @@ LIBVERSION=0:1:0
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS) $(TALLOC_LIBS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 if ENABLE_PCSC
 # FIXME: only build the PC/SC dependent part conditional, but always build other parts
diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am
index 32b38fb3..7b5e1e59 100644
--- a/src/vty/Makefile.am
+++ b/src/vty/Makefile.am
@@ -12,6 +12,6 @@ lib_LTLIBRARIES = libosmovty.la
 libosmovty_la_SOURCES = buffer.c command.c vty.c vector.c utils.c \
 			telnet_interface.c logging_vty.c stats_vty.c \
 			fsm_vty.c talloc_ctx_vty.c
-libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined $(TALLOC_LIBS)
-libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la
+libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
+libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS)
 endif