diff options
| author | Max <msuraev@sysmocom.de> | 2017-10-30 13:19:58 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2017-10-30 13:50:31 +0100 |
| commit | ba1059c173ac8f4845464c4f91d1890898f729a0 (patch) | |
| tree | a2b56f276eedd8675f1b51f629fb551dd3bbccac /src/ctrl | |
| parent | d9abb0a70869bdf4546d9cd0de39461773a1638f (diff) | |
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
Diffstat (limited to 'src/ctrl')
| -rw-r--r-- | src/ctrl/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
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 |