From 92b13bc8750b17405f8cd6e862067464287a6214 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 29 Feb 2016 14:18:51 +0100 Subject: fix build: move local include dir before sys installed one --- src/Makefile.am | 2 +- src/hnbap/Makefile.am | 2 +- src/ranap/Makefile.am | 2 +- src/rua/Makefile.am | 2 +- src/tests/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0f82404..b0badc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ ranap_encoder.c ranap_decoder.c: $(ASN1_ROOT)/ranap/RANAP-PDU-Contents.asn $(ASN # this is ugly ^. ranap_ies_defs.h is generated from asn1tostruct.py here, but # it should live in include/osmocom/ranap/. -AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -I../include +AM_CFLAGS = -I../include $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) COMMON_LDADD = -lsctp # build the shared RANAP library diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 1b05050..621dac3 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) $(OSMOCORE_CFLAGS) -I../../include +AM_CFLAGS = -I../../include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) 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 5655dd0..ccda5d2 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) $(OSMOCORE_CFLAGS) -I../../include +AM_CFLAGS = -I../../include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) noinst_LTLIBRARIES=libosmo-asn1-ranap.la libosmo_asn1_ranap_la_SOURCES=$(ASN_MODULE_SRC) diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 908fc8e..075fdf3 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) $(OSMOCORE_CFLAGS) -I../../include +AM_CFLAGS = -I../../include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) 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 1bf50d2..739410b 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(OSMOVTY_CFLAGS) $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -g -I$(top_srcdir)/src -I$(top_srcdir)/include +AM_CFLAGS = -g -I$(top_srcdir)/src -I$(top_srcdir)/include $(OSMOVTY_CFLAGS) $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) COMMON_LIBS = $(OSMOVTY_LIBS) $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) -lsctp -- cgit v1.2.3