aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Huemer <alexander.huemer@xx.vu>2015-12-23 22:21:19 +0100
committerHarald Welte <laforge@gnumonks.org>2015-12-24 16:15:17 +0100
commitef8934612c91302f7d345a074cfcda124712084e (patch)
treebc7b393d38d988aa0bda058f4978162138d4a776
parent7ac7e048b423c01ba4376ab76d1e31cce0191fab (diff)
fix build if depenedencies are in distinct directories
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/hnbap/Makefile.am2
-rw-r--r--src/ranap/Makefile.am2
-rw-r--r--src/rua/Makefile.am2
-rw-r--r--src/tests/Makefile.am2
6 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 0b77531..018aa17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ AC_PROG_RANLIB
PKG_CHECK_MODULES(OSMOCORE, libosmocore)
PKG_CHECK_MODULES(OSMOGSM, libosmogsm)
PKG_CHECK_MODULES(OSMOVTY, libosmovty)
+PKG_CHECK_MODULES(OSMONETIF, libosmo-netif)
PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran)
PKG_CHECK_MODULES(ASN1C, libasn1c)
diff --git a/src/Makefile.am b/src/Makefile.am
index 27e0e19..00af272 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = hnbap rua ranap tests
ASN1_ROOT = $(top_builddir)/asn1/
ASN1TOSTRUCT = $(ASN1_ROOT)/utils/asn1tostruct.py
-AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -Ihnbap/
+AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -Ihnbap/
COMMON_LDADD = -lsctp
bin_PROGRAMS = hnbgw
diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
index a9e8163..e152587 100644
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@@ -232,7 +232,7 @@ ASN_MODULE_INC= \
PrivateMessage.h \
IE.h
-AM_CFLAGS = $(ASN1C_CFLAGS) -I.
+AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I.
noinst_LIBRARIES=libosmo-asn1-hnbap.a
libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_SOURCES)
diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am
index d3071e8..6abe7ef 100644
--- a/src/ranap/Makefile.am
+++ b/src/ranap/Makefile.am
@@ -1160,7 +1160,7 @@ ASN_MODULE_INC= \
RANAP_LeftMBMSBearerService-IEs.h \
RANAP_UnsuccessfulLinking-IEs.h
-AM_CFLAGS = $(ASN1C_CFLAGS) -I.
+AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I.
noinst_LIBRARIES=libosmo-asn1-ranap.a
libosmo_asn1_ranap_a_SOURCES=$(ASN_MODULE_SRC)
diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am
index c93b801..cb13a1c 100644
--- a/src/rua/Makefile.am
+++ b/src/rua/Makefile.am
@@ -72,7 +72,7 @@ ASN_MODULE_INC= \
RUA_PrivateMessage.h \
RUA_IE.h
-AM_CFLAGS = $(ASN1C_CFLAGS) -I.
+AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I.
noinst_LIBRARIES=libosmo-asn1-rua.a
libosmo_asn1_rua_a_SOURCES=$(ASN_MODULE_SOURCES)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 424d106..77b419a 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(OSMOVTY_CFLAGS) $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(ASN1C_CFLAGS) -g -I$(top_builddir)/src -I$(top_builddir)/src/hnbap/
+AM_CFLAGS = $(OSMOVTY_CFLAGS) $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) -g -I$(top_builddir)/src -I$(top_builddir)/src/hnbap/
COMMON_LIBS = $(OSMOVTY_LIBS) $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) -lsctp