neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28245 )
Change subject: install libosmo-gtlv, libosmo-pfcp ......................................................................
install libosmo-gtlv, libosmo-pfcp
The first user of this is osmo-hnbgw, to implement GTP mapping via a UPF.
Related: SYS#5895 Change-Id: I9f4651b6bee457583aba99052dc82bbf675515e6 --- M Makefile.am M configure.ac A libosmo-gtlv.pc.in A libosmo-pfcp.pc.in M src/libosmo-gtlv/Makefile.am M src/libosmo-pfcp/Makefile.am M tests/libosmo-gtlv/Makefile.am M tests/libosmo-gtlv/test_gtlv_gen/Makefile.am M tests/libosmo-gtlv/test_tliv/Makefile.am M tests/libosmo-pfcp/Makefile.am 10 files changed, 43 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/45/28245/1
diff --git a/Makefile.am b/Makefile.am index 4452f04..7bba342 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,12 @@ contrib \ $(NULL)
+pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = \ + libosmo-gtlv.pc \ + libosmo-pfcp.pc \ + $(NULL) + BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = \ .version \ diff --git a/configure.ac b/configure.ac index 1b2cdea..3864cd2 100644 --- a/configure.ac +++ b/configure.ac @@ -195,6 +195,8 @@ 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-gtlv.pc.in b/libosmo-gtlv.pc.in new file mode 100644 index 0000000..69de862 --- /dev/null +++ b/libosmo-gtlv.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom Generic TLV Library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -losmo-gtlv +Cflags: -I${includedir}/ 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-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index 248ff67..fb8d26f 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -16,11 +16,11 @@ $(COVERAGE_LDFLAGS) \ $(NULL)
-noinst_LIBRARIES = \ - libosmo-gtlv.a \ +lib_LTLIBRARIES = \ + libosmo-gtlv.la \ $(NULL)
-libosmo_gtlv_a_SOURCES = \ +libosmo_gtlv_la_SOURCES = \ gtlv.c \ gtlv_dec_enc.c \ gtlv_gen.c \ diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index db81648..6840648 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -19,11 +19,11 @@ $(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 \ @@ -56,7 +56,7 @@ $(NULL)
gen__pfcp_ies_auto_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(COVERAGE_LDFLAGS) \ $(NULL) diff --git a/tests/libosmo-gtlv/Makefile.am b/tests/libosmo-gtlv/Makefile.am index 45d6ec2..20721c0 100644 --- a/tests/libosmo-gtlv/Makefile.am +++ b/tests/libosmo-gtlv/Makefile.am @@ -28,7 +28,7 @@ $(NULL)
gtlv_test_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
@@ -37,7 +37,7 @@ $(NULL)
gtlv_dec_enc_test_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
diff --git a/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am b/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am index 0d27292..e13e7b5 100644 --- a/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am +++ b/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am @@ -35,7 +35,7 @@ $(NULL)
gen__myproto_ies_auto_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
@@ -51,7 +51,7 @@ $(NULL)
gtlv_gen_test_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
diff --git a/tests/libosmo-gtlv/test_tliv/Makefile.am b/tests/libosmo-gtlv/test_tliv/Makefile.am index eb95e12..458a410 100644 --- a/tests/libosmo-gtlv/test_tliv/Makefile.am +++ b/tests/libosmo-gtlv/test_tliv/Makefile.am @@ -35,7 +35,7 @@ $(NULL)
gen__myproto_ies_auto_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
@@ -51,7 +51,7 @@ $(NULL)
tliv_test_LDADD = \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am index fda143f..bd18d06 100644 --- a/tests/libosmo-pfcp/Makefile.am +++ b/tests/libosmo-pfcp/Makefile.am @@ -22,8 +22,8 @@ $(NULL)
pfcp_test_LDADD = \ - $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.a \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.la \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL)
-
neels