From d116902c7d11abb68ee1465ef4cb9701f3b4af98 Mon Sep 17 00:00:00 2001 From: Neels Janosch Hofmeyr Date: Wed, 8 Mar 2023 02:25:18 +0100 Subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv By moving *_LIBS to libosmo_pfcp_la_LIBADD, fix linking of gen__pfcp_ies_auto to prefer the locally built libosmo-gtlv over a system installed one. Related: OS#5942 Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 --- src/libosmo-pfcp/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index 123aff3..a26d5b2 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -11,11 +11,6 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(NULL) -AM_LDFLAGS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - lib_LTLIBRARIES = \ libosmo-pfcp.la \ $(NULL) @@ -30,6 +25,12 @@ libosmo_pfcp_la_SOURCES = \ pfcp_ies_auto.c \ $(NULL) +libosmo_pfcp_la_LIBADD = \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(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 -- cgit v1.2.3