Move out gbproxy to its own subdir
Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e
diff --git a/src/Makefile.am b/src/Makefile.am
index d2dcb9f..024938d 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 0000000..6876f68
--- /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
similarity index 100%
rename from src/gprs/gb_proxy.c
rename to src/gbproxy/gb_proxy.c
diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gbproxy/gb_proxy_ctrl.c
similarity index 100%
rename from src/gprs/gb_proxy_ctrl.c
rename to src/gbproxy/gb_proxy_ctrl.c
diff --git a/src/gprs/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c
similarity index 100%
rename from src/gprs/gb_proxy_main.c
rename to src/gbproxy/gb_proxy_main.c
diff --git a/src/gprs/gb_proxy_patch.c b/src/gbproxy/gb_proxy_patch.c
similarity index 100%
rename from src/gprs/gb_proxy_patch.c
rename to src/gbproxy/gb_proxy_patch.c
diff --git a/src/gprs/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
similarity index 100%
rename from src/gprs/gb_proxy_peer.c
rename to src/gbproxy/gb_proxy_peer.c
diff --git a/src/gprs/gb_proxy_tlli.c b/src/gbproxy/gb_proxy_tlli.c
similarity index 100%
rename from src/gprs/gb_proxy_tlli.c
rename to src/gbproxy/gb_proxy_tlli.c
diff --git a/src/gprs/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c
similarity index 100%
rename from src/gprs/gb_proxy_vty.c
rename to src/gbproxy/gb_proxy_vty.c
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 0471bfe..8f7f054 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -55,26 +55,10 @@
$(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 \