Move out gbproxy to its own subdir

Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e

10 files changed, 47 insertions, 16 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d2dcb9fba..024938d81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
 	gprs \
+	gbproxy \
 	$(NULL)
diff --git a/src/gbproxy/Makefile.am b/src/gbproxy/Makefile.am
new file mode 100644
index 000000000..6876f68a5
--- /dev/null
+++ b/src/gbproxy/Makefile.am
@@ -0,0 +1,46 @@
+AM_CPPFLAGS = \
+	$(all_includes) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir) \
+	$(NULL)
+
+AM_CFLAGS = \
+	-Wall \
+	-fno-strict-aliasing \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOGB_CFLAGS) \
+	$(LIBOSMOGSUPCLIENT_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(LIBGTP_CFLAGS) \
+	$(NULL)
+
+bin_PROGRAMS = \
+	osmo-gbproxy \
+	$(NULL)
+
+osmo_gbproxy_SOURCES = \
+	gb_proxy.c \
+	gb_proxy_main.c \
+	gb_proxy_vty.c \
+	gb_proxy_ctrl.c \
+	gb_proxy_patch.c \
+	gb_proxy_tlli.c \
+	gb_proxy_peer.c \
+	$(NULL)
+osmo_gbproxy_LDADD = \
+	$(top_builddir)/src/gprs/gprs_gb_parse.o \
+	$(top_builddir)/src/gprs/gprs_llc_parse.o \
+	$(top_builddir)/src/gprs/crc24.o \
+	$(top_builddir)/src/gprs/gprs_utils.o \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOGB_LIBS) \
+	$(LIBGTP_LIBS) \
+	-lrt \
+	$(NULL)
diff --git a/src/gprs/gb_proxy.c b/src/gbproxy/gb_proxy.c
index 3f471ff82..3f471ff82 100644
--- a/src/gprs/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gbproxy/gb_proxy_ctrl.c
index 4b7c2f430..4b7c2f430 100644
--- a/src/gprs/gb_proxy_ctrl.c
+++ b/src/gbproxy/gb_proxy_ctrl.c
diff --git a/src/gprs/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c
index 4319fda63..4319fda63 100644
--- a/src/gprs/gb_proxy_main.c
+++ b/src/gbproxy/gb_proxy_main.c
diff --git a/src/gprs/gb_proxy_patch.c b/src/gbproxy/gb_proxy_patch.c
index 6235b04f4..6235b04f4 100644
--- a/src/gprs/gb_proxy_patch.c
+++ b/src/gbproxy/gb_proxy_patch.c
diff --git a/src/gprs/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index 48482b6a1..48482b6a1 100644
--- a/src/gprs/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
diff --git a/src/gprs/gb_proxy_tlli.c b/src/gbproxy/gb_proxy_tlli.c
index 4e21ede86..4e21ede86 100644
--- a/src/gprs/gb_proxy_tlli.c
+++ b/src/gbproxy/gb_proxy_tlli.c
diff --git a/src/gprs/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c
index 5c4f45420..5c4f45420 100644
--- a/src/gprs/gb_proxy_vty.c
+++ b/src/gbproxy/gb_proxy_vty.c
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 0471bfe7c..8f7f054e7 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -55,26 +55,10 @@ libcommon_la_LIBADD = \
 	$(NULL)
 
 bin_PROGRAMS = \
-	osmo-gbproxy \
 	osmo-sgsn \
 	osmo-gtphub \
 	$(NULL)
 
-osmo_gbproxy_SOURCES = \
-	gb_proxy.c \
-	gb_proxy_main.c \
-	gb_proxy_vty.c \
-	gb_proxy_ctrl.c \
-	gb_proxy_patch.c \
-	gb_proxy_tlli.c \
-	gb_proxy_peer.c \
-	$(NULL)
-osmo_gbproxy_LDADD = \
-	libcommon.la \
-	$(OSMO_LIBS) \
-	-lrt \
-	$(NULL)
-
 osmo_sgsn_SOURCES = \
 	gprs_gb.c \
 	gprs_gmm_attach.c \