pespin has uploaded this change for review.
Move header files to include/osmocom/cbc/ dir
Change-Id: Id6c9f99805169d624a2c6e001fe1983e24fdc5c3
---
M configure.ac
A include/Makefile.am
A include/osmocom/Makefile.am
A include/osmocom/cbc/Makefile.am
R include/osmocom/cbc/cbc_data.h
R include/osmocom/cbc/cbsp_server.h
R include/osmocom/cbc/charset.h
R include/osmocom/cbc/internal.h
R include/osmocom/cbc/rest_it_op.h
M src/Makefile.am
M src/cbc_data.c
M src/cbc_main.c
M src/cbc_vty.c
M src/cbsp_server.c
M src/cbsp_server_fsm.c
M src/charset.c
M src/message_handling.c
M src/rest_api.c
M src/rest_it_op.c
M src/smscb_message_fsm.c
M src/smscb_peer_fsm.c
21 files changed, 46 insertions(+), 42 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/16/28516/1
diff --git a/configure.ac b/configure.ac
index 3f5eaf8..180ab96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,9 @@
AC_OUTPUT(
src/Makefile
+ include/Makefile
+ include/osmocom/Makefile
+ include/osmocom/cbc/Makefile
contrib/Makefile
contrib/osmo-cbc.spec
tests/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..3578a80
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = osmocom
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
new file mode 100644
index 0000000..a8e8b9b
--- /dev/null
+++ b/include/osmocom/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = cbc
diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am
new file mode 100644
index 0000000..1135800
--- /dev/null
+++ b/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)
diff --git a/src/cbc_data.h b/include/osmocom/cbc/cbc_data.h
similarity index 100%
rename from src/cbc_data.h
rename to include/osmocom/cbc/cbc_data.h
diff --git a/src/cbsp_server.h b/include/osmocom/cbc/cbsp_server.h
similarity index 97%
rename from src/cbsp_server.h
rename to include/osmocom/cbc/cbsp_server.h
index 21367c4..1576864 100644
--- a/src/cbsp_server.h
+++ b/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)
diff --git a/src/charset.h b/include/osmocom/cbc/charset.h
similarity index 100%
rename from src/charset.h
rename to include/osmocom/cbc/charset.h
diff --git a/src/internal.h b/include/osmocom/cbc/internal.h
similarity index 98%
rename from src/internal.h
rename to include/osmocom/cbc/internal.h
index 29093b5..e3521bd 100644
--- a/src/internal.h
+++ b/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,
diff --git a/src/rest_it_op.h b/include/osmocom/cbc/rest_it_op.h
similarity index 96%
rename from src/rest_it_op.h
rename to include/osmocom/cbc/rest_it_op.h
index f7cc808..94a617e 100644
--- a/src/rest_it_op.h
+++ b/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,
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f82a54..b59dc1a 100644
--- a/src/Makefile.am
+++ b/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 = \
diff --git a/src/cbc_data.c b/src/cbc_data.c
index 60c0998..4b2c831 100644
--- a/src/cbc_data.c
+++ b/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" },
diff --git a/src/cbc_main.c b/src/cbc_main.c
index 2ce5287..c49514b3 100644
--- a/src/cbc_main.c
+++ b/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;
diff --git a/src/cbc_vty.c b/src/cbc_vty.c
index 5d154c6..b07bf70 100644
--- a/src/cbc_vty.c
+++ b/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)
{
diff --git a/src/cbsp_server.c b/src/cbsp_server.c
index c6312dc..215f643 100644
--- a/src/cbsp_server.c
+++ b/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 {
diff --git a/src/cbsp_server_fsm.c b/src/cbsp_server_fsm.c
index b99a80a..903e08a 100644
--- a/src/cbsp_server_fsm.c
+++ b/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))
diff --git a/src/charset.c b/src/charset.c
index efaff8e..2ca4aa3 100644
--- a/src/charset.c
+++ b/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)
diff --git a/src/message_handling.c b/src/message_handling.c
index 8d66d01..a8c8368 100644
--- a/src/message_handling.c
+++ b/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,
diff --git a/src/rest_api.c b/src/rest_api.c
index 52bf25e..a779f3d 100644
--- a/src/rest_api.c
+++ b/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)
diff --git a/src/rest_it_op.c b/src/rest_it_op.c
index a91c758..ae1aaff 100644
--- a/src/rest_it_op.c
+++ b/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
diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c
index 0dd1f13..04b0718 100644
--- a/src/smscb_message_fsm.c
+++ b/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))
diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c
index 21f17e6..510c198 100644
--- a/src/smscb_peer_fsm.c
+++ b/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))
To view, visit change 28516. To unsubscribe, or for help writing mail filters, visit settings.