diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-03-04 02:46:37 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-05-08 17:02:32 +0200 |
commit | 4ac8009c29889472848f5b25f45d8e7dbfb24a31 (patch) | |
tree | fe8c83132f90e0f4c9aeb4d8639e78b06171bfa5 | |
parent | e27fa1502237afb6aba0f56caab05970fff670be (diff) |
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
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08.c | 2 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08_cc.c | 2 | ||||
-rw-r--r-- | src/libmsc/gsm_04_11.c | 2 | ||||
-rw-r--r-- | src/libmsc/gsm_04_14.c | 2 | ||||
-rw-r--r-- | src/libmsc/msc_net_init.c | 2 | ||||
-rw-r--r-- | src/libmsc/msc_vty.c | 2 | ||||
-rw-r--r-- | src/libmsc/ran_infra.c | 2 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 2 |
10 files changed, 9 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index 78974d7d0..bcd684787 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ debian/*.log .deps Makefile Makefile.in -bscconfig.h -bscconfig.h.in +config.h +config.h.in *.pc *.*~ diff --git a/configure.ac b/configure.ac index ae6dd6ac2..36ff99e3c 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"]) 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 667a1c605..79488cda5 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 aa9764968..0624d5697 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 60cdaee6e..ff5576f44 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 044b61c0b..811655813 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 51e859595..637ee74ea 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 bb3639257..a3237cd3d 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 a3a7457f8..af4054149 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 857a6a691..e101d8939 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> |