From 2f102058ca8ac40ba4fef95d19d4c1a43c5e0fb6 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sat, 9 Apr 2022 17:38:06 +0200 Subject: [PATCH] install libosmo-pfcp The first user of this is osmo-hnbgw, to implement GTP mapping via a UPF. Related: SYS#5895 Change-Id: If4465095000a898296d69d5b725507f909c87aa3 --- Makefile.am | 1 + configure.ac | 1 + libosmo-pfcp.pc.in | 10 ++++++++++ src/libosmo-pfcp/Makefile.am | 13 ++++++++++--- tests/libosmo-pfcp/Makefile.am | 4 ++-- 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 libosmo-pfcp.pc.in diff --git a/Makefile.am b/Makefile.am index c9ee8fc..de0b643 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ SUBDIRS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ libosmo-gtlv.pc \ + libosmo-pfcp.pc \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index c59836c..4391ff9 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,7 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT( libosmo-gtlv.pc + libosmo-pfcp.pc include/Makefile include/osmocom/Makefile include/osmocom/gtlv/Makefile diff --git a/libosmo-pfcp.pc.in b/libosmo-pfcp.pc.in new file mode 100644 index 0000000..c482751 --- /dev/null +++ b/libosmo-pfcp.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom PFCP library +Description: C Utility Library that implements the PFCP protocol and endpoint +Version: @VERSION@ +Libs: -L${libdir} -losmo-pfcp +Cflags: -I${includedir}/ diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index f6174fa..1f4b80f 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -19,11 +19,11 @@ AM_LDFLAGS = \ $(COVERAGE_LDFLAGS) \ $(NULL) -noinst_LIBRARIES = \ - libosmo-pfcp.a \ +lib_LTLIBRARIES = \ + libosmo-pfcp.la \ $(NULL) -libosmo_pfcp_a_SOURCES = \ +libosmo_pfcp_la_SOURCES = \ pfcp_endpoint.c \ pfcp_ies_custom.c \ pfcp_msg.c \ @@ -32,6 +32,13 @@ libosmo_pfcp_a_SOURCES = \ pfcp_ies_auto.c \ $(NULL) +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool +# documentation before making any modification +LIBVERSION=1:0:0 + +libosmo_pfcp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' + BUILT_SOURCES = \ pfcp_ies_auto.c \ $(NULL) diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am index 022e029..a2bcdf6 100644 --- a/tests/libosmo-pfcp/Makefile.am +++ b/tests/libosmo-pfcp/Makefile.am @@ -22,9 +22,9 @@ pfcp_test_SOURCES = \ $(NULL) pfcp_test_LDADD = \ - $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.a \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ + $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.la \ $(NULL) .PHONY: update_exp