From c2f2ad8a5f575a38011bfa9b1833a88ed393dd1d Mon Sep 17 00:00:00 2001 From: Alexander Huemer Date: Thu, 15 Sep 2016 16:02:18 +0200 Subject: Build fixes Some fixes for build environments where dependencies are installed in distinct directories. Change-Id: I38808fd2911747b266ee6fde91187a88dd7ae355 --- openbsc/src/gprs/Makefile.am | 4 +++- openbsc/tests/gtphub/Makefile.am | 4 +++- openbsc/tests/mm_auth/Makefile.am | 1 + openbsc/tests/sgsn/Makefile.am | 3 ++- openbsc/tests/xid/Makefile.am | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 02c887872..59136bd32 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -28,10 +28,12 @@ endif OSMO_LIBS = \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOGB_LIBS) \ + $(LIBGTP_LIBS) \ $(NULL) bin_PROGRAMS = \ @@ -121,6 +123,6 @@ osmo_gtphub_LDADD = \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBCARES_LIBS) \ + $(LIBGTP_LIBS) \ -lrt \ - -lgtp \ $(NULL) diff --git a/openbsc/tests/gtphub/Makefile.am b/openbsc/tests/gtphub/Makefile.am index 137924da2..5c834b782 100644 --- a/openbsc/tests/gtphub/Makefile.am +++ b/openbsc/tests/gtphub/Makefile.am @@ -7,6 +7,8 @@ AM_CFLAGS = \ -Wall \ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGTP_CFLAGS) \ $(NULL) EXTRA_DIST = \ @@ -35,6 +37,6 @@ gtphub_test_LDADD = \ $(top_builddir)/src/gprs/gtphub.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(LIBOSMOCORE_LIBS) \ - -lgtp \ + $(LIBGTP_LIBS) \ -lrt \ $(NULL) diff --git a/openbsc/tests/mm_auth/Makefile.am b/openbsc/tests/mm_auth/Makefile.am index 7eb14fa49..cb351988b 100644 --- a/openbsc/tests/mm_auth/Makefile.am +++ b/openbsc/tests/mm_auth/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBCRYPTO_CFLAGS) \ $(NULL) diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am index 637170703..d148c4879 100644 --- a/openbsc/tests/sgsn/Makefile.am +++ b/openbsc/tests/sgsn/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = \ -Wall \ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBCARES_CFLAGS) \ $(NULL) @@ -63,7 +64,7 @@ sgsn_test_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ - -lgtp \ + $(LIBGTP_LIBS) \ -lrt \ $(NULL) if BUILD_IU diff --git a/openbsc/tests/xid/Makefile.am b/openbsc/tests/xid/Makefile.am index e7c4cf028..aaf17edf2 100644 --- a/openbsc/tests/xid/Makefile.am +++ b/openbsc/tests/xid/Makefile.am @@ -32,7 +32,7 @@ xid_test_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ - -lgtp \ + $(LIBGTP_LIBS) \ -lrt \ -lm \ $(NULL) -- cgit v1.2.3