From patchwork Wed Dec 23 21:21:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Huemer X-Patchwork-Id: 560740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (tmp.osmocom.org [144.76.43.76]) by ozlabs.org (Postfix) with ESMTP id 1E97C140662 for ; Thu, 24 Dec 2015 08:21:39 +1100 (AEDT) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 1E111AC36; Wed, 23 Dec 2015 21:21:37 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from yade.xx.vu (yade.xx.vu [IPv6:2a01:4f8:d16:342::2]) by lists.osmocom.org (Postfix) with ESMTP id D6719AC2C for ; Wed, 23 Dec 2015 21:21:33 +0000 (UTC) Received: from void.sbg.xx.vu (smtpout2.drei.com [109.126.64.2]) by yade.xx.vu (Postfix) with ESMTPSA id 178522441E4; Wed, 23 Dec 2015 22:21:31 +0100 (CET) From: Alexander Huemer To: openbsc@lists.osmocom.org Subject: [PATCH] fix build if depenedencies are in distinct directories Date: Wed, 23 Dec 2015 22:21:19 +0100 Message-Id: <1450905679-7583-2-git-send-email-alexander.huemer@xx.vu> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1450905679-7583-1-git-send-email-alexander.huemer@xx.vu> References: <1450905679-7583-1-git-send-email-alexander.huemer@xx.vu> X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" --- configure.ac | 1 + src/Makefile.am | 2 +- src/hnbap/Makefile.am | 2 +- src/ranap/Makefile.am | 2 +- src/rua/Makefile.am | 2 +- src/tests/Makefile.am | 2 +- 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 d609445..5ac0907 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 a44ad2c..8335057 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