From 8c88219ecc1f468e994bdbbce7dafffb250a2fd9 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 8 Aug 2022 01:38:36 +0700 Subject: [PATCH] {src,tests}/Makefile.am: $(COMMON_LA) is not definied Change-Id: I4958b5d62645be6ed2a200a50a23c567c9a9f3c0 --- src/Makefile.am | 4 ++-- tests/Makefile.am | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index fedc96f9..dea4a173 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -161,7 +161,7 @@ osmo_pcu_remote_LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOGSM_LIBS) \ - $(COMMON_LA) + $(NULL) endif if ENABLE_LC15BTS_PHY @@ -210,6 +210,6 @@ osmo_pcu_LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOGSM_LIBS) \ - $(COMMON_LA) + $(NULL) #MOSTLYCLEANFILES += testSource testDestination diff --git a/tests/Makefile.am b/tests/Makefile.am index fdc0a6c7..7c509699 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,7 @@ rlcmac_RLCMACTest_SOURCES = rlcmac/RLCMACTest.cpp rlcmac_RLCMACTest_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) alloc_AllocTest_SOURCES = alloc/AllocTest.cpp alloc_AllocTest_LDADD = \ @@ -33,7 +33,7 @@ alloc_AllocTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) alloc_MslotTest_SOURCES = alloc/MslotTest.cpp alloc_MslotTest_LDADD = \ @@ -42,7 +42,7 @@ alloc_MslotTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) tbf_TbfTest_SOURCES = tbf/TbfTest.cpp tbf_TbfTest_LDADD = \ @@ -51,7 +51,7 @@ tbf_TbfTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) tbf_TbfTest_LDFLAGS = -Wl,--wrap=pcu_sock_send bitcomp_BitcompTest_SOURCES = bitcomp/BitcompTest.cpp ../src/egprs_rlc_compression.cpp @@ -59,7 +59,7 @@ bitcomp_BitcompTest_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) edge_EdgeTest_SOURCES = edge/EdgeTest.cpp edge_EdgeTest_LDADD = \ @@ -68,7 +68,7 @@ edge_EdgeTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) emu_pcu_emu_SOURCES = emu/pcu_emu.cpp emu/test_replay_gprs_attach.cpp \ emu/openbsc_clone.c emu/openbsc_clone.h emu/gprs_tests.h \ @@ -79,7 +79,7 @@ emu_pcu_emu_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) types_TypesTest_SOURCES = types/TypesTest.cpp types_TypesTest_LDADD = \ @@ -88,7 +88,7 @@ types_TypesTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) ms_MsTest_SOURCES = ms/MsTest.cpp ms_MsTest_LDADD = \ @@ -97,7 +97,7 @@ ms_MsTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) ms_MsTest_LDFLAGS = \ -Wl,-u,bssgp_prim_cb @@ -109,7 +109,7 @@ llc_LlcTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) llc_LlcTest_LDFLAGS = \ -Wl,-u,bssgp_prim_cb @@ -117,14 +117,14 @@ llc_LlcTest_LDFLAGS = \ llist_LListTest_SOURCES = llist/LListTest.cpp llist_LListTest_LDADD = \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) codel_codel_test_SOURCES = codel/codel_test.c codel_codel_test_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) fn_FnTest_SOURCES = fn/FnTest.cpp fn_FnTest_LDADD = \ @@ -133,7 +133,7 @@ fn_FnTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) app_info_AppInfoTest_SOURCES = app_info/AppInfoTest.cpp app_info_AppInfoTest_LDADD = \ @@ -142,7 +142,7 @@ app_info_AppInfoTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) ulc_PdchUlcTest_SOURCES = ulc/PdchUlcTest.cpp ulc_PdchUlcTest_LDADD = \ @@ -151,7 +151,7 @@ ulc_PdchUlcTest_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) + $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac