fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/31788 )
Change subject: {src,tests}/Makefile.am: libraries shall not be in AM_LDFLAGS
......................................................................
{src,tests}/Makefile.am: libraries shall not be in AM_LDFLAGS
Change-Id: Ibd7eb55e2cfe7daed2f8a8d74c6a3ede6f29308f
---
M src/Makefile.am
M tests/Makefile.am
2 files changed, 32 insertions(+), 17 deletions(-)
Approvals:
Jenkins Builder: Verified
msuraev: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/Makefile.am b/src/Makefile.am
index e747d74..25d58c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,6 @@
endif
AM_CXXFLAGS = -Wall
-AM_LDFLAGS = -lrt
noinst_LTLIBRARIES = libgprs.la
@@ -165,6 +164,7 @@
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOCTRL_LIBS) \
$(LIBOSMOGSM_LIBS) \
+ -lrt \
$(NULL)
endif
@@ -214,6 +214,7 @@
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOCTRL_LIBS) \
$(LIBOSMOGSM_LIBS) \
+ -lrt \
$(NULL)
#MOSTLYCLEANFILES += testSource testDestination
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7c50969..df63dd1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,10 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS)
$(LIBOSMOCTRL_CFLAGS) $(LIBOSMOGB_CFLAGS) $(LIBOSMOGSM_CFLAGS)
-I$(top_srcdir)/src/ -I$(top_srcdir)/include/
-AM_LDFLAGS = -lrt -no-install
+AM_LDFLAGS = -no-install
+
+LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ -lrt \
+ $(NULL)
check_PROGRAMS = \
rlcmac/RLCMACTest \
@@ -23,7 +28,7 @@
rlcmac_RLCMACTest_SOURCES = rlcmac/RLCMACTest.cpp
rlcmac_RLCMACTest_LDADD = \
$(top_builddir)/src/libgprs.la \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
alloc_AllocTest_SOURCES = alloc/AllocTest.cpp
@@ -32,7 +37,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
alloc_MslotTest_SOURCES = alloc/MslotTest.cpp
@@ -41,7 +46,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
tbf_TbfTest_SOURCES = tbf/TbfTest.cpp
@@ -50,7 +55,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
tbf_TbfTest_LDFLAGS = -Wl,--wrap=pcu_sock_send
@@ -58,7 +63,7 @@
bitcomp_BitcompTest_LDADD = \
$(top_builddir)/src/libgprs.la \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
edge_EdgeTest_SOURCES = edge/EdgeTest.cpp
@@ -67,7 +72,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
emu_pcu_emu_SOURCES = emu/pcu_emu.cpp emu/test_replay_gprs_attach.cpp \
@@ -78,7 +83,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
types_TypesTest_SOURCES = types/TypesTest.cpp
@@ -87,7 +92,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
ms_MsTest_SOURCES = ms/MsTest.cpp
@@ -96,7 +101,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
ms_MsTest_LDFLAGS = \
@@ -108,7 +113,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
llc_LlcTest_LDFLAGS = \
@@ -116,14 +121,14 @@
llist_LListTest_SOURCES = llist/LListTest.cpp
llist_LListTest_LDADD = \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
codel_codel_test_SOURCES = codel/codel_test.c
codel_codel_test_LDADD = \
$(top_builddir)/src/libgprs.la \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
fn_FnTest_SOURCES = fn/FnTest.cpp
@@ -132,7 +137,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
app_info_AppInfoTest_SOURCES = app_info/AppInfoTest.cpp
@@ -141,7 +146,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
ulc_PdchUlcTest_SOURCES = ulc/PdchUlcTest.cpp
@@ -150,7 +155,7 @@
$(LIBOSMOGB_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOCORE_LIBS) \
+ $(LDADD) \
$(NULL)
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31788
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ibd7eb55e2cfe7daed2f8a8d74c6a3ede6f29308f
Gerrit-Change-Number: 31788
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: msuraev <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
