fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/31841 ) Change subject: tests: there shall be no libraries in LDFLAGS ...................................................................... tests: there shall be no libraries in LDFLAGS Change-Id: I95b07b5a7735fb2753281555a4544f1ba967579e --- M tests/CommonLibs/Makefile.am M tests/Transceiver52M/Makefile.am 2 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/41/31841/1 diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am index 941badb..1a5b922 100644 --- a/tests/CommonLibs/Makefile.am +++ b/tests/CommonLibs/Makefile.am @@ -12,7 +12,12 @@ $(LIBOSMOVTY_CFLAGS) \ $(NULL) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) +LDADD = \ + $(COMMON_LA) \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(NULL) EXTRA_DIST = BitVectorTest.ok \ PRBSTest.ok \ @@ -31,21 +36,16 @@ LogTest BitVectorTest_SOURCES = BitVectorTest.cpp -BitVectorTest_LDADD = $(COMMON_LA) PRBSTest_SOURCES = PRBSTest.cpp InterthreadTest_SOURCES = InterthreadTest.cpp -InterthreadTest_LDADD = $(COMMON_LA) -InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS) +InterthreadTest_LDADD = $(LDADD) -lpthread TimevalTest_SOURCES = TimevalTest.cpp -TimevalTest_LDADD = $(COMMON_LA) VectorTest_SOURCES = VectorTest.cpp -VectorTest_LDADD = $(COMMON_LA) LogTest_SOURCES = LogTest.cpp -LogTest_LDADD = $(COMMON_LA) MOSTLYCLEANFILES += testSource testDestination diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index cb22c2a..2077c95 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -26,10 +26,11 @@ if DEVICE_LMS check_PROGRAMS += LMSDeviceTest LMSDeviceTest_SOURCES = LMSDeviceTest.cpp -LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) LMSDeviceTest_LDADD = \ $(top_builddir)/Transceiver52M/device/lms/libdevice.la \ + $(LIBOSMOCORE_LIBS) \ $(COMMON_LA) \ - $(LMS_LIBS) + $(LMS_LIBS) \ + $(NULL) LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS) endif -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I95b07b5a7735fb2753281555a4544f1ba967579e Gerrit-Change-Number: 31841 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> Gerrit-MessageType: newchange