From ba1059c173ac8f4845464c4f91d1890898f729a0 Mon Sep 17 00:00:00 2001
From: Max <msuraev@sysmocom.de>
Date: Mon, 30 Oct 2017 13:19:58 +0100
Subject: 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
---
 src/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.am')

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
-- 
cgit v1.2.3