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

include/osmocom/iuh/Makefile.am

@@ -1,2 +1,4 @@
 noinst_HEADERS = \
-	vty.h
+	vty.h \
+	context_map.h hnbgw.h hnbgw_cn.h \
+	hnbgw_hnbap.h hnbgw_rua.h hnbgw_ranap.h

include/osmocom/iuh/hnbgw_cn.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 struct hnbgw_cnlink *hnbgw_cnlink_init(struct hnb_gw *gw, const char *host, uint16_t port, int is_ps);

include/osmocom/iuh/hnbgw_hnbap.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 int hnbgw_hnbap_rx(struct hnb_context *hnb, struct msgb *msg);
 int hnbgw_hnbap_init(void);

include/osmocom/iuh/hnbgw_ranap.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len);
 int hnbgw_ranap_init(void);

include/osmocom/iuh/hnbgw_rua.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 #include <osmocom/rua/RUA_Cause.h>
 
 int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg);

include/osmocom/rua/Makefile.am

@@ -1,5 +1,5 @@
 noinst_HEADERS = \
-	rua_common.h rua_ies_defs.h \
+	rua_common.h rua_ies_defs.h rua_msg_factory.h \
 	RUA_Ansi-41-IDNNS.h \
 	RUA_Cause.h \
 	RUA_CauseMisc.h \

src/Makefile.am

@@ -60,9 +60,6 @@ libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_
 #
 bin_PROGRAMS = osmo-hnbgw
 
-noinst_HEADERS = context_map.h hnbgw.h hnbgw_cn.h \
-		 hnbgw_hnbap.h hnbgw_rua.h hnbgw_ranap.h
-
 osmo_hnbgw_SOURCES = hnbap_encoder.c hnbap_decoder.c hnbap_common.c \
 		     rua_encoder.c rua_decoder.c rua_common.c \
 		     rua_msg_factory.c \

src/context_map.c

@@ -24,8 +24,8 @@
 
 #include <osmocom/core/timer.h>
 
-#include "hnbgw.h"
-#include "context_map.h"
+#include <osmocom/iuh/hnbgw.h>
+#include <osmocom/iuh/context_map.h>
 
 /* is a given SCCP USER SAP Connection ID in use for a given CN link? */
 static int cn_id_in_use(struct hnbgw_cnlink *cn, uint32_t id)

src/hnbap_common.c

@@ -25,7 +25,7 @@
 
 #include <osmocom/hnbap/HNBAP-PDU.h>
 #include <osmocom/hnbap/hnbap_common.h>
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 static const struct value_string hnbap_cause_radio_vals[] = {
 	{ CauseRadioNetwork_overload,		    "overload" },

src/hnbgw.c

@@ -51,11 +51,11 @@
 #include <osmocom/sigtran/protocol/sua.h>
 #include <osmocom/sigtran/sccp_sap.h>
 
-#include "hnbgw.h"
-#include "hnbgw_hnbap.h"
-#include "hnbgw_rua.h"
-#include "hnbgw_cn.h"
-#include "context_map.h"
+#include <osmocom/iuh/hnbgw.h>
+#include <osmocom/iuh/hnbgw_hnbap.h>
+#include <osmocom/iuh/hnbgw_rua.h>
+#include <osmocom/iuh/hnbgw_cn.h>
+#include <osmocom/iuh/context_map.h>
 
 static const char * const osmo_hnbgw_copyright =
 	"OsmoHNBGW - Osmocom Home Node B Gateway implementation\r\n"

src/hnbgw_cn.c

@@ -29,11 +29,11 @@
 #include <osmocom/sigtran/sccp_sap.h>
 #include <osmocom/sigtran/sccp_helpers.h>
 
-#include "hnbgw.h"
-#include "hnbgw_rua.h"
+#include <osmocom/iuh/hnbgw.h>
+#include <osmocom/iuh/hnbgw_rua.h>
 #include <osmocom/ranap/ranap_ies_defs.h>
 #include <osmocom/ranap/ranap_msg_factory.h>
-#include "context_map.h"
+#include <osmocom/iuh/context_map.h>
 
 /***********************************************************************
  * Outbound RANAP RESET to CN

src/hnbgw_hnbap.c

@@ -31,7 +31,7 @@
 #include <osmocom/hnbap/hnbap_common.h>
 #include <osmocom/ranap/iu_helpers.h>
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 #include <osmocom/hnbap/hnbap_ies_defs.h>
 
 #define IU_MSG_NUM_IES		32

src/hnbgw_ranap.c

@@ -29,8 +29,8 @@
 
 #include "asn1helpers.h"
 
-#include "hnbgw.h"
-#include "hnbgw_rua.h"
+#include <osmocom/iuh/hnbgw.h>
+#include <osmocom/iuh/hnbgw_rua.h>
 #include <osmocom/ranap/ranap_common.h>
 #include <osmocom/ranap/ranap_ies_defs.h>
 #include <osmocom/ranap/ranap_msg_factory.h>

src/hnbgw_rua.c

@@ -32,11 +32,11 @@
 
 #include "asn1helpers.h"
 
-#include "hnbgw.h"
-#include "hnbgw_ranap.h"
+#include <osmocom/iuh/hnbgw.h>
+#include <osmocom/iuh/hnbgw_ranap.h>
 #include <osmocom/rua/rua_common.h>
 #include <osmocom/rua/rua_ies_defs.h>
-#include "context_map.h"
+#include <osmocom/iuh/context_map.h>
 
 static int hnbgw_rua_tx(struct hnb_context *ctx, struct msgb *msg)
 {

src/hnbgw_vty.c

@@ -22,8 +22,8 @@
 
 #include <osmocom/iuh/vty.h>
 
-#include "hnbgw.h"
-#include "context_map.h"
+#include <osmocom/iuh/hnbgw.h>
+#include <osmocom/iuh/context_map.h>
 
 static void *tall_hnb_ctx = NULL;
 static struct hnb_gw *g_hnb_gw = NULL;

src/ranap_common_cn.c

@@ -29,7 +29,7 @@
 #include <osmocom/ranap/ranap_common_cn.h>
 #include <osmocom/ranap/ranap_ies_defs.h>
 
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 static int cn_ranap_rx_initiating_msg_co(void *ctx, RANAP_InitiatingMessage_t *imsg,
 					 ranap_message *message)

src/rua_common.c

@@ -24,7 +24,7 @@
 #include <osmocom/core/msgb.h>
 
 #include <osmocom/rua/rua_common.h>
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 extern int asn1_xer_print;
 

src/rua_msg_factory.c

@@ -3,9 +3,9 @@
 
 #include <osmocom/rua/rua_common.h>
 #include <osmocom/rua/rua_ies_defs.h>
-#include "rua_msg_factory.h"
+#include <osmocom/rua/rua_msg_factory.h>
 #include "asn1helpers.h"
-#include "hnbgw.h"
+#include <osmocom/iuh/hnbgw.h>
 
 
 struct msgb *rua_new_udt(struct msgb *inmsg)

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

@@ -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

@@ -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

@@ -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

@@ -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;