neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32621 )
(
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: add non-installed libhnbgw.la for test linkage ......................................................................
add non-installed libhnbgw.la for test linkage
To ease linking C tests, introduce a libhnbgw.la that contains all of osmo-hnbgw except the main() and friends.
(I wrote a test that I was going to add, but it turned out to be obsolete -- now at least we may keep this preparation to add C tests more easily.)
Change-Id: Id2a706a30fb459005c676bb29c196cf3a582fa01 --- M src/osmo-hnbgw/Makefile.am M tests/ranap_rab_ass/Makefile.am 2 files changed, 35 insertions(+), 17 deletions(-)
Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index de96128..e8b4966 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -26,11 +26,11 @@ $(COVERAGE_LDFLAGS) \ $(NULL)
-bin_PROGRAMS = \ - osmo-hnbgw \ +noinst_LTLIBRARIES = \ + libhnbgw.la \ $(NULL)
-osmo_hnbgw_SOURCES = \ +libhnbgw_la_SOURCES = \ hnbgw.c \ hnbgw_hnbap.c \ hnbgw_rua.c \ @@ -43,10 +43,9 @@ ranap_rab_ass.c \ mgw_fsm.c \ tdefs.c \ - osmo_hnbgw_main.c \ $(NULL)
-osmo_hnbgw_LDADD = \ +libhnbgw_la_LIBADD = \ $(LIBASN1C_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ @@ -64,16 +63,26 @@
if ENABLE_PFCP AM_CFLAGS += \ - $(LIBOSMOGTLV_CFLAGS) \ $(LIBOSMOPFCP_CFLAGS) \ $(NULL) -osmo_hnbgw_LDADD += \ - $(LIBOSMOGTLV_LIBS) \ +libhnbgw_la_LIBADD += \ $(LIBOSMOPFCP_LIBS) \ $(NULL) -osmo_hnbgw_SOURCES += \ +libhnbgw_la_SOURCES += \ hnbgw_pfcp.c \ ps_rab_ass_fsm.c \ ps_rab_fsm.c \ $(NULL) endif + +bin_PROGRAMS = \ + osmo-hnbgw \ + $(NULL) + +osmo_hnbgw_SOURCES = \ + osmo_hnbgw_main.c \ + $(NULL) + +osmo_hnbgw_LDADD = \ + libhnbgw.la \ + $(NULL) diff --git a/tests/ranap_rab_ass/Makefile.am b/tests/ranap_rab_ass/Makefile.am index 918682c..4757337 100644 --- a/tests/ranap_rab_ass/Makefile.am +++ b/tests/ranap_rab_ass/Makefile.am @@ -30,14 +30,7 @@ $(NULL)
ranap_rab_ass_test_LDADD = \ - $(LIBASN1C_LIBS) \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMORANAP_LIBS) \ - $(LIBOSMOSIGTRAN_LIBS) \ - $(LIBOSMOMGCPCLIENT_LIBS) \ - $(COVERAGE_LDFLAGS) \ - $(top_builddir)/src/osmo-hnbgw/ranap_rab_ass.o \ + $(top_builddir)/src/osmo-hnbgw/libhnbgw.la \ $(NULL)
.PHONY: update_exp
-
neels