aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-06-15 20:21:44 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-06-15 20:31:43 +0800
commit28e2988ce2eb38c5da9d3920355d63ccec14ccf5 (patch)
tree85d83e9ba326a836e66aaba80c4216ef6de3aecf
parent434a1fd84e6dbeb538d570f836430734b6967b17 (diff)
nat: Add the OSMO NAT to the build process.
-rw-r--r--openbsc/configure.in2
-rw-r--r--openbsc/include/openbsc/Makefile.am2
-rw-r--r--openbsc/src/Makefile.am2
-rw-r--r--openbsc/src/nat/Makefile.am13
-rw-r--r--openbsc/tests/Makefile.am2
5 files changed, 18 insertions, 3 deletions
diff --git a/openbsc/configure.in b/openbsc/configure.in
index d2fd67a2f..ef9592039 100644
--- a/openbsc/configure.in
+++ b/openbsc/configure.in
@@ -54,10 +54,12 @@ AC_OUTPUT(
src/Makefile
src/ipaccess/Makefile
src/gprs/Makefile
+ src/nat/Makefile
tests/Makefile
tests/debug/Makefile
tests/gsm0408/Makefile
tests/db/Makefile
tests/channel/Makefile
tests/sccp/Makefile
+ tests/bsc-nat/Makefile
Makefile)
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 5957d71c6..465b21a11 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \
vty.h socket.h \
crc24.h gprs_bssgp.h gprs_llc.h gprs_ns.h gprs_gmm.h \
gb_proxy.h gprs_sgsn.h gsm_04_08_gprs.h sgsn.h \
- gprs_ns_frgre.h auth.h osmo_msc.h
+ gprs_ns_frgre.h auth.h osmo_msc.h bsc_msc.h bsc_nat.h
openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h
openbscdir = $(includedir)/openbsc
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 11b98247b..2c92a8694 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS)
# build current directory before building gprs
-SUBDIRS = . ipaccess gprs
+SUBDIRS = . ipaccess gprs nat
sbin_PROGRAMS = bsc_hack bs11_config isdnsync bsc_mgcp
noinst_LIBRARIES = libbsc.a libmsc.a libvty.a libsccp.a libmgcp.a
diff --git a/openbsc/src/nat/Makefile.am b/openbsc/src/nat/Makefile.am
new file mode 100644
index 000000000..0ca3bdfc2
--- /dev/null
+++ b/openbsc/src/nat/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS)
+
+bin_PROGRAMS = bsc_nat
+
+
+bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
+ bsc_nat_vty.c bsc_sccp.c \
+ $(top_srcdir)/src/debug.c $(top_srcdir)/src/bsc_msc.c
+bsc_nat_LDADD = $(top_builddir)/src/libvty.a $(top_builddir)/src/libsccp.a \
+ $(top_builddir)/src/libmgcp.a $(top_builddir)/src/libbsc.a \
+ -lrt
diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index 3b1b93120..b469832fc 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -1 +1 @@
-SUBDIRS = debug gsm0408 db channel sccp
+SUBDIRS = debug gsm0408 db channel sccp bsc-nat