Change in osmo-msc[master]: rename bscconfig.h to config.h, cleanup

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/13138 )

Change subject: rename bscconfig.h to config.h, cleanup
......................................................................

rename bscconfig.h to config.h, cleanup

Get rid of the legacy name bscconfig.h from osmo-nitb times.

Remove the #include from some of the files that aren't actually using it.

Instead of '#include "../../config.h"', use plain '#include "config.h"'
because we're anyway passing $top_srcdir as -I during compilation.

Change-Id: Id4f683be1f36f0630c83da54e02868aae847aeec
---
M .gitignore
M configure.ac
M src/libmsc/gsm_04_08.c
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_04_14.c
M src/libmsc/msc_net_init.c
M src/libmsc/msc_vty.c
M src/libmsc/ran_infra.c
M src/osmo-msc/msc_main.c
10 files changed, 9 insertions(+), 13 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/.gitignore b/.gitignore
index 78974d7..bcd6847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@
 .deps
 Makefile
 Makefile.in
-bscconfig.h
-bscconfig.h.in
+config.h
+config.h.in
 *.pc
 
 *.*~
diff --git a/configure.ac b/configure.ac
index ae6dd6a..36ff99e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
 dnl Generate the output
-AM_CONFIG_HEADER(bscconfig.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
     include/Makefile
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 667a1c6..79488cd 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -32,7 +32,7 @@
 #include <regex.h>
 #include <sys/types.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/debug.h>
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index aa97649..0624d56 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -30,8 +30,6 @@
 #include <regex.h>
 #include <sys/types.h>
 
-#include "bscconfig.h"
-
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 60cdaee..ff5576f 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <netinet/in.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/talloc.h>
diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c
index 044b61c..8116558 100644
--- a/src/libmsc/gsm_04_14.c
+++ b/src/libmsc/gsm_04_14.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "bscconfig.h"
-
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c
index 51e8595..637ee74 100644
--- a/src/libmsc/msc_net_init.c
+++ b/src/libmsc/msc_net_init.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/core/tdef.h>
 
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index bb36392..a3237cd 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -23,7 +23,7 @@
 /* NOTE: I would have liked to call this the MSC_NODE instead of the MSC_NODE,
  * but MSC_NODE already exists to configure a remote MSC for osmo-bsc. */
 
-#include "../../bscconfig.h"
+#include "config.h"
 
 #include <inttypes.h>
 #include <limits.h>
diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c
index a3a7457..af40541 100644
--- a/src/libmsc/ran_infra.c
+++ b/src/libmsc/ran_infra.c
@@ -31,7 +31,7 @@
 
 #include <osmocom/msc/ran_infra.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 const struct value_string an_proto_names[] = {
 	{ OSMO_GSUP_ACCESS_NETWORK_PROTOCOL_TS3G_48006, "Ts3G-48006" },
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 857a6a6..e101d89 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -36,7 +36,7 @@
 #include <getopt.h>
 
 /* build switches from the configure script */
-#include "../../bscconfig.h"
+#include "config.h"
 
 #include <osmocom/msc/db.h>
 #include <osmocom/core/application.h>

-- 
To view, visit https://gerrit.osmocom.org/13138
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4f683be1f36f0630c83da54e02868aae847aeec
Gerrit-Change-Number: 13138
Gerrit-PatchSet: 16
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-CC: Max <suraev at alumni.ntnu.no>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190508/898497f1/attachment.htm>