aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-03-03 23:36:48 +0100
committerHarald Welte <laforge@gnumonks.org>2011-03-03 23:36:48 +0100
commita17faf8512992a53a14e8b615f5369be05c5f0cc (patch)
tree044ab53a68634ddcf12130bbc1275e86423e449f
parent31c00f7d6fa63937f2c973157d196a427f6eef95 (diff)
Rename bsc_nat -> osmo-bsc_nat and bsc_mgcp -> osmo-bsc_mgcp
This now enforces a unique structure: All of our main daemon programs start with an "osmo-" prefix.
-rw-r--r--openbsc/configure.in3
-rw-r--r--openbsc/src/Makefile.am9
-rw-r--r--openbsc/src/osmo-bsc_mgcp/Makefile.am9
-rw-r--r--openbsc/src/osmo-bsc_mgcp/mgcp_main.c (renamed from openbsc/src/mgcp/mgcp_main.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/Makefile.am (renamed from openbsc/src/nat/Makefile.am)6
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_filter.c (renamed from openbsc/src/nat/bsc_filter.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c (renamed from openbsc/src/nat/bsc_mgcp_utils.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat.c (renamed from openbsc/src/nat/bsc_nat.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat_utils.c (renamed from openbsc/src/nat/bsc_nat_utils.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat_vty.c (renamed from openbsc/src/nat/bsc_nat_vty.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_sccp.c (renamed from openbsc/src/nat/bsc_sccp.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_ussd.c (renamed from openbsc/src/nat/bsc_ussd.c)0
12 files changed, 16 insertions, 11 deletions
diff --git a/openbsc/configure.in b/openbsc/configure.in
index 525bad82c..65b39e606 100644
--- a/openbsc/configure.in
+++ b/openbsc/configure.in
@@ -95,7 +95,8 @@ AC_OUTPUT(
src/common/Makefile
src/osmo-nitb/Makefile
src/osmo-bsc/Makefile
- src/nat/Makefile
+ src/osmo-bsc_nat/Makefile
+ src/osmo-bsc_mgcp/Makefile
src/ipaccess/Makefile
src/utils/Makefile
src/gprs/Makefile
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index e4b2b960c..1a8ec6483 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -2,17 +2,12 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
-SUBDIRS = common abis mgcp bsc trau osmo-nitb utils ipaccess gprs
+SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gprs
# Conditional modules
if BUILD_NAT
-SUBDIRS += nat
+SUBDIRS += osmo-bsc_nat
endif
if BUILD_BSC
SUBDIRS += osmo-bsc
endif
-
-bin_PROGRAMS = bsc_mgcp
-
-bsc_mgcp_SOURCES = mgcp/mgcp_main.c
-bsc_mgcp_LDADD = common/libcommon.a mgcp/libmgcp.a $(LIBOSMOVTY_LIBS)
diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am
new file mode 100644
index 000000000..b72c46c4f
--- /dev/null
+++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am
@@ -0,0 +1,9 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
+
+bin_PROGRAMS = bsc_mgcp
+
+bsc_mgcp_SOURCES = mgcp_main.c
+bsc_mgcp_LDADD = $(top_srcdir)/src/common/libcommon.a $(top_srcdir)/src/mgcp/libmgcp.a \
+ $(LIBOSMOVTY_LIBS)
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
index c8d9a625e..c8d9a625e 100644
--- a/openbsc/src/mgcp/mgcp_main.c
+++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
diff --git a/openbsc/src/nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
index 7ee587d42..c7905ce3a 100644
--- a/openbsc/src/nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
-bin_PROGRAMS = bsc_nat
+bin_PROGRAMS = osmo-bsc_nat
-bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
+osmo_bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
bsc_nat_vty.c bsc_sccp.c bsc_ussd.c
-bsc_nat_LDADD = $(top_builddir)/src/common/libcommon.a \
+osmo_bsc_nat_LDADD = $(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/mgcp/libmgcp.a $(top_builddir)/src/bsc/libbsc.a \
$(top_builddir)/src/abis/libabis.a $(top_builddir)/src/trau/libtrau.a \
-lrt $(LIBOSMOSCCP_LIBS)
diff --git a/openbsc/src/nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c
index 73e987893..73e987893 100644
--- a/openbsc/src/nat/bsc_filter.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c
diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
index 9eac00bf4..9eac00bf4 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index 643b3c4ba..643b3c4ba 100644
--- a/openbsc/src/nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
diff --git a/openbsc/src/nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index cd294ccfb..cd294ccfb 100644
--- a/openbsc/src/nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 786db2dc2..786db2dc2 100644
--- a/openbsc/src/nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
diff --git a/openbsc/src/nat/bsc_sccp.c b/openbsc/src/osmo-bsc_nat/bsc_sccp.c
index 72de11201..72de11201 100644
--- a/openbsc/src/nat/bsc_sccp.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_sccp.c
diff --git a/openbsc/src/nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c
index c121abe5d..c121abe5d 100644
--- a/openbsc/src/nat/bsc_ussd.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c