From d39783cd178afd87f80ae67077b8511e676cbb4c Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sat, 9 Apr 2022 17:38:06 +0200 Subject: install libosmo-gtlv Related: SYS#5895 Change-Id: I9f4651b6bee457583aba99052dc82bbf675515e6 --- Makefile.am | 5 +++++ configure.ac | 1 + libosmo-gtlv.pc.in | 10 ++++++++++ src/libosmo-gtlv/Makefile.am | 13 ++++++++++--- src/libosmo-pfcp/Makefile.am | 2 +- tests/libosmo-gtlv/Makefile.am | 4 ++-- tests/libosmo-gtlv/test_gtlv_gen/Makefile.am | 4 ++-- tests/libosmo-gtlv/test_tliv/Makefile.am | 4 ++-- tests/libosmo-pfcp/Makefile.am | 2 +- 9 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 libosmo-gtlv.pc.in diff --git a/Makefile.am b/Makefile.am index 428205e..c9ee8fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,11 @@ SUBDIRS = \ contrib \ $(NULL) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = \ + libosmo-gtlv.pc \ + $(NULL) + BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = \ .version \ diff --git a/configure.ac b/configure.ac index 30bd554..c59836c 100644 --- a/configure.ac +++ b/configure.ac @@ -85,6 +85,7 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) AC_OUTPUT( + libosmo-gtlv.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/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index 248ff67..1c40386 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -16,12 +16,19 @@ AM_LDFLAGS = \ $(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 \ $(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_gtlv_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index db81648..f6174fa 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -56,7 +56,7 @@ gen__pfcp_ies_auto_SOURCES = \ $(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 @@ gtlv_test_SOURCES = \ $(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 @@ gtlv_dec_enc_test_SOURCES = \ $(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 @@ gen__myproto_ies_auto_SOURCES = \ $(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 @@ gtlv_gen_test_SOURCES = \ $(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 @@ gen__myproto_ies_auto_SOURCES = \ $(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 @@ tliv_test_SOURCES = \ $(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..022e029 100644 --- a/tests/libosmo-pfcp/Makefile.am +++ b/tests/libosmo-pfcp/Makefile.am @@ -23,7 +23,7 @@ pfcp_test_SOURCES = \ pfcp_test_LDADD = \ $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.a \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ $(NULL) -- cgit v1.2.3