neels submitted this change.

View Change


Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
build: add libupf.la (noinst)

Like we do in osmo-bsc.git, gather the osmo-upf objects into a
not-installed libupf.la, so that we can trivially and flexibly link
these to regression test programs.

Will be used by upcoming patch I36acff15f22d23ade4d281c2af3eb117dfc10359
(unique_ids_test).

Change-Id: Id179a47b5d40821d86c7214add14449600198e07
---
M src/osmo-upf/Makefile.am
1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/osmo-upf/Makefile.am b/src/osmo-upf/Makefile.am
index d5e392b..be72bc2 100644
--- a/src/osmo-upf/Makefile.am
+++ b/src/osmo-upf/Makefile.am
@@ -18,19 +18,15 @@
$(NULL)

AM_LDFLAGS = \
- $(LIBGTPNL_LDFLAGS) \
- $(LIBNFTNL_LDFLAGS) \
- $(LIBNFTABLES_LDFLAGS) \
$(COVERAGE_LDFLAGS) \
$(NULL)

-bin_PROGRAMS = \
- osmo-upf \
+noinst_LTLIBRARIES = \
+ libupf.la \
$(NULL)

-osmo_upf_SOURCES = \
+libupf_la_SOURCES = \
netinst.c \
- osmo_upf_main.c \
up_endpoint.c \
up_gtp_action.c \
up_peer.c \
@@ -42,7 +38,7 @@
upf_vty.c \
$(NULL)

-osmo_upf_LDADD = \
+libupf_la_LIBADD = \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOVTY_LIBS) \
$(LIBOSMOCTRL_LIBS) \
@@ -50,5 +46,16 @@
$(LIBGTPNL_LIBS) \
$(LIBNFTNL_LIBS) \
$(LIBNFTABLES_LIBS) \
- $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+bin_PROGRAMS = \
+ osmo-upf \
+ $(NULL)
+
+osmo_upf_SOURCES = \
+ osmo_upf_main.c \
+ $(NULL)
+
+osmo_upf_LDADD = \
+ libupf.la \
$(NULL)

To view, visit change 31920. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Id179a47b5d40821d86c7214add14449600198e07
Gerrit-Change-Number: 31920
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged