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.
This commit is contained in:
parent
31c00f7d6f
commit
a17faf8512
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
|
@ -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)
|
Loading…
Reference in New Issue