[PATCH] openbsc[master]: Build fixes

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

ahuemer gerrit-no-reply at lists.osmocom.org
Thu Sep 15 14:03:39 UTC 2016


Hello Neels Hofmeyr, Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/839

to look at the new patch set (#5).

Build fixes

Some fixes for build environments where dependencies are installed in
distinct directories.

Change-Id: I38808fd2911747b266ee6fde91187a88dd7ae355
---
M openbsc/src/gprs/Makefile.am
M openbsc/tests/gtphub/Makefile.am
M openbsc/tests/mm_auth/Makefile.am
M openbsc/tests/sgsn/Makefile.am
M openbsc/tests/xid/Makefile.am
5 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/39/839/5

diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 02c8878..59136bd 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -28,10 +28,12 @@
 
 OSMO_LIBS = \
 	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
 	$(LIBOSMOGB_LIBS) \
+	$(LIBGTP_LIBS) \
 	$(NULL)
 
 bin_PROGRAMS = \
@@ -121,6 +123,6 @@
 	$(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 137924d..5c834b7 100644
--- a/openbsc/tests/gtphub/Makefile.am
+++ b/openbsc/tests/gtphub/Makefile.am
@@ -7,6 +7,8 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBGTP_CFLAGS) \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -35,6 +37,6 @@
 	$(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 7eb14fa..cb35198 100644
--- a/openbsc/tests/mm_auth/Makefile.am
+++ b/openbsc/tests/mm_auth/Makefile.am
@@ -6,6 +6,7 @@
 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 6371707..d148c48 100644
--- a/openbsc/tests/sgsn/Makefile.am
+++ b/openbsc/tests/sgsn/Makefile.am
@@ -7,6 +7,7 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBCARES_CFLAGS) \
 	$(NULL)
@@ -63,7 +64,7 @@
 	$(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 e7c4cf0..aaf17ed 100644
--- a/openbsc/tests/xid/Makefile.am
+++ b/openbsc/tests/xid/Makefile.am
@@ -32,7 +32,7 @@
 	$(LIBOSMOGB_LIBS) \
 	$(LIBCARES_LIBS) \
 	$(LIBCRYPTO_LIBS) \
-	-lgtp \
+	$(LIBGTP_LIBS) \
 	-lrt \
 	-lm \
 	$(NULL)

-- 
To view, visit https://gerrit.osmocom.org/839
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I38808fd2911747b266ee6fde91187a88dd7ae355
Gerrit-PatchSet: 5
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: ahuemer <alexander.huemer at xx.vu>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>



More information about the gerrit-log mailing list