commit df63de2e37af890f3abb11d4de2334c2b49ae13c
author Neels Hofmeyr <neels@hofmeyr.de> Thu Aug 18 13:13:55 2016 +0200
committer Harald Welte <laforge@gnumonks.org> Fri Sep 09 06:43:32 2016 +0000
tree fbba6d8566475df9e97b24fa0967de0f74029c97
parent 30e08f5b8e9ed4dbc12983d61eb1f1661eb91dd0

build: move headers to include/osmocom/*

This came up while fixing 'make distcheck'; this is certainly not the easiest
way but it makes sense to have the headers in include/, like we do in openbsc.

The easy alternative might be to add -I$(top_srcdir)/src to src/Makefile.am.

Remove -I$(top_srcdir)/src from src/tests/Makefile.am, no longer needed.

Change-Id: I5a82e029dcdc4df0a60a31271a4883393fe59234

src/tests/Makefile.am

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 2ba3e89..3a99681 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,9 +1,14 @@
-AM_CFLAGS = -g -I$(top_srcdir)/src -I$(top_srcdir)/include $(OSMOVTY_CFLAGS) $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS)
+AM_CFLAGS = -g -I$(top_srcdir)/src/tests \
+	-I$(top_srcdir)/include -I$(top_builddir)/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
 
 check_PROGRAMS = test-ranap test-helpers test-hnbap hnb-test dummy-cn
 
+noinst_HEADERS = test_common.h hnb-test.h hnb-test-layers.h
+
 HNBAP_FILES = $(top_srcdir)/src/hnbap_common.c $(top_srcdir)/src/hnbap_decoder.c $(top_srcdir)/src/hnbap_encoder.c
 RUA_FILES = $(top_srcdir)/src/rua_common.c $(top_srcdir)/src/rua_decoder.c $(top_srcdir)/src/rua_encoder.c $(top_srcdir)/src/rua_msg_factory.c
 

src/tests/dummy_cn_sua.c

diff --git a/src/tests/dummy_cn_sua.c b/src/tests/dummy_cn_sua.c
index c2fc712..f9b4244 100644
--- a/src/tests/dummy_cn_sua.c
+++ b/src/tests/dummy_cn_sua.c
@@ -24,7 +24,7 @@
 #include <osmocom/ranap/ranap_ies_defs.h>
 #include <osmocom/ranap/ranap_common_cn.h>
 #include <osmocom/ranap/ranap_msg_factory.h>
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 int asn1_xer_print = 1;
 const char *cmdline_bind_addr = "127.0.0.1";

src/tests/hnb-test.c

diff --git a/src/tests/hnb-test.c b/src/tests/hnb-test.c
index 2c41199..d338077 100644
--- a/src/tests/hnb-test.c
+++ b/src/tests/hnb-test.c
@@ -54,7 +54,7 @@
 #include "hnb-test-layers.h"
 #include <osmocom/hnbap/hnbap_common.h>
 #include <osmocom/hnbap/hnbap_ies_defs.h>
-#include "rua_msg_factory.h"
+#include <osmocom/rua/rua_msg_factory.h>
 #include "asn1helpers.h"
 #include <osmocom/ranap/iu_helpers.h>
 #include "test_common.h"

src/tests/test-ranap.c

diff --git a/src/tests/test-ranap.c b/src/tests/test-ranap.c
index ce01b96..c70009b 100644
--- a/src/tests/test-ranap.c
+++ b/src/tests/test-ranap.c
@@ -32,7 +32,7 @@
 
 #include "test_common.h"
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 int asn1_xer_print = 1;
 

src/tests/test_common.c

diff --git a/src/tests/test_common.c b/src/tests/test_common.c
index a79d5f5..5a37e7e 100644
--- a/src/tests/test_common.c
+++ b/src/tests/test_common.c
@@ -37,7 +37,7 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/logging.h>
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 void *talloc_asn1_ctx;