Move header files to include/osmocom/cbc/ dir

Change-Id: Id6c9f99805169d624a2c6e001fe1983e24fdc5c3

Makefile.am

@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = src doc contrib tests
+SUBDIRS = include src doc contrib tests
 
 EXTRA_DIST = .version \
 	README.md \

configure.ac

@@ -169,6 +169,9 @@ AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
 AC_OUTPUT(
     src/Makefile
+    include/Makefile
+    include/osmocom/Makefile
+    include/osmocom/cbc/Makefile
     contrib/Makefile
     contrib/osmo-cbc.spec
     tests/Makefile

include/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = osmocom

include/osmocom/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = cbc

include/osmocom/cbc/Makefile.am

@@ -0,0 +1,7 @@
+noinst_HEADERS = \
+	cbc_data.h \
+	cbsp_server.h \
+	charset.h \
+	internal.h \
+	rest_it_op.h \
+	$(NULL)

include/osmocom/cbc/cbsp_server.h

@@ -3,7 +3,7 @@
 #include <osmocom/gsm/cbsp.h>
 #include <osmocom/netif/stream.h>
 
-#include "cbc_data.h"
+#include <osmocom/cbc/cbc_data.h>
 
 #define LOGPCC(client, level, fmt, args...) \
 	LOGP(DCBSP, level, "%s: " fmt, cbsp_cbc_client_name(client), ## args)

include/osmocom/cbc/internal.h

@@ -5,7 +5,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/core/fsm.h>
 
-#include "cbc_data.h"
+#include <osmocom/cbc/cbc_data.h>
 
 enum {
 	DCBSP,

include/osmocom/cbc/rest_it_op.h

@@ -7,7 +7,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/it_q.h>
 
-#include "cbc_data.h"
+#include <osmocom/cbc/cbc_data.h>
 
 enum rest_it_operation {
 	REST_IT_OP_NONE,

src/Makefile.am

@@ -1,18 +1,10 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/src
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
 		   $(LIBOSMONETIF_CFLAGS) \
 		   $(ULFIUS_CFLAGS) $(JANSSON_CFLAGS) $(ORCANIA_CFLAGS) \
 		   $(COVERAGE_CFLAGS)
 AM_LDFLAGS=$(COVERAGE_LDFLAGS)
 
-EXTRA_DIST = \
-	cbc_data.h \
-	cbsp_server.h \
-	charset.h \
-	internal.h \
-	rest_it_op.h \
-	$(NULL)
-
 bin_PROGRAMS = osmo-cbc
 
 osmo_cbc_SOURCES = \

src/cbc_data.c

@@ -28,8 +28,8 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
 
-#include "cbc_data.h"
-#include "cbsp_server.h"
+#include <osmocom/cbc/cbc_data.h>
+#include <osmocom/cbc/cbsp_server.h>
 
 const struct value_string cbc_peer_proto_name[] = {
 	{ CBC_PEER_PROTO_CBSP, "CBSP" },

src/cbc_main.c

@@ -44,9 +44,9 @@
 #include <osmocom/vty/logging.h>
 #include <osmocom/vty/misc.h>
 
-#include "internal.h"
-#include "cbsp_server.h"
-#include "cbc_data.h"
+#include <osmocom/cbc/internal.h>
+#include <osmocom/cbc/cbsp_server.h>
+#include <osmocom/cbc/cbc_data.h>
 
 static void *tall_cbc_ctx;
 struct cbc *g_cbc;

src/cbc_vty.c

@@ -30,9 +30,9 @@
 #include <osmocom/vty/buffer.h>
 #include <osmocom/vty/vty.h>
 
-#include "cbc_data.h"
-#include "internal.h"
-#include "cbsp_server.h"
+#include <osmocom/cbc/cbc_data.h>
+#include <osmocom/cbc/internal.h>
+#include <osmocom/cbc/cbsp_server.h>
 
 static void dump_one_cbc_peer(struct vty *vty, const struct cbc_peer *peer)
 {

src/cbsp_server.c

@@ -31,8 +31,8 @@
 #include <osmocom/gsm/protocol/gsm_48_049.h>
 #include <osmocom/netif/stream.h>
 
-#include "internal.h"
-#include "cbsp_server.h"
+#include <osmocom/cbc/internal.h>
+#include <osmocom/cbc/cbsp_server.h>
 
 #if 0
 struct osmo_cbsp_bsc {

src/cbsp_server_fsm.c

@@ -22,8 +22,8 @@
 
 #include <osmocom/gsm/cbsp.h>
 
-#include "cbsp_server.h"
-#include "internal.h"
+#include <osmocom/cbc/cbsp_server.h>
+#include <osmocom/cbc/internal.h>
 
 #define S(x)	(1 << (x))
 

src/charset.c

@@ -24,7 +24,7 @@
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/core/utils.h>
 
-#include "charset.h"
+#include <osmocom/cbc/charset.h>
 
 /* pad the entire "remainder" of a buffer with repeated instances of the given pad character */
 static void pad_with_septets(uint8_t *buf, size_t buf_len, int num_septets, char pad_char)

src/message_handling.c

@@ -27,10 +27,10 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/cbsp.h>
 
-#include "cbc_data.h"
-#include "cbsp_server.h"
-#include "rest_it_op.h"
-#include "internal.h"
+#include <osmocom/cbc/cbc_data.h>
+#include <osmocom/cbc/cbsp_server.h>
+#include <osmocom/cbc/rest_it_op.h>
+#include <osmocom/cbc/internal.h>
 
 /* convert cbc_message to osmo_cbsp_cell_list */
 static int cbcmsg_to_cbsp_cell_list(const void *ctx, struct osmo_cbsp_cell_list *list,

src/rest_api.c

@@ -37,10 +37,10 @@
 
 #define PREFIX  "/api/ecbe/v1"
 
-#include "internal.h"
-#include "charset.h"
-#include "cbc_data.h"
-#include "rest_it_op.h"
+#include <osmocom/cbc/internal.h>
+#include <osmocom/cbc/charset.h>
+#include <osmocom/cbc/cbc_data.h>
+#include <osmocom/cbc/rest_it_op.h>
 
 /* get an integer value for field "key" in object "parent" */
 static int json_get_integer(int *out, json_t *parent, const char *key)

src/rest_it_op.c

@@ -26,8 +26,8 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/it_q.h>
 
-#include "rest_it_op.h"
-#include "internal.h"
+#include <osmocom/cbc/rest_it_op.h>
+#include <osmocom/cbc/internal.h>
 
 /***********************************************************************
  * HTTP THREAD

src/smscb_message_fsm.c

@@ -30,10 +30,10 @@
 #include <osmocom/gsm/gsm0808_utils.h>
 #include <osmocom/gsm/cbsp.h>
 
-#include "cbc_data.h"
-#include "cbsp_server.h"
-#include "internal.h"
-#include "rest_it_op.h"
+#include <osmocom/cbc/cbc_data.h>
+#include <osmocom/cbc/cbsp_server.h>
+#include <osmocom/cbc/internal.h>
+#include <osmocom/cbc/rest_it_op.h>
 
 #define S(x)    (1 << (x))
 

src/smscb_peer_fsm.c

@@ -32,9 +32,9 @@
 #include <osmocom/gsm/gsm0808_utils.h>
 #include <osmocom/gsm/cbsp.h>
 
-#include "cbc_data.h"
-#include "cbsp_server.h"
-#include "internal.h"
+#include <osmocom/cbc/cbc_data.h>
+#include <osmocom/cbc/cbsp_server.h>
+#include <osmocom/cbc/internal.h>
 
 #define S(x)	(1 << (x))