aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-08-30 19:50:48 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-09-02 14:03:04 +0200
commitea05d5c5f89f034a8d2c4151507f59a520535d9a (patch)
tree18f394d35c6c0db1f6921d90ec78a292bc4c641c /src
parent9d016fd499cb23ad6d9e4c2757dbc4e1c154107d (diff)
Move out gtphub to its own subdir
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gprs/Makefile.am19
-rw-r--r--src/gtphub/Makefile.am45
-rw-r--r--src/gtphub/gtphub.c (renamed from src/gprs/gtphub.c)0
-rw-r--r--src/gtphub/gtphub_ares.c (renamed from src/gprs/gtphub_ares.c)0
-rw-r--r--src/gtphub/gtphub_main.c (renamed from src/gprs/gtphub_main.c)0
-rw-r--r--src/gtphub/gtphub_sock.c (renamed from src/gprs/gtphub_sock.c)0
-rw-r--r--src/gtphub/gtphub_vty.c (renamed from src/gprs/gtphub_vty.c)0
8 files changed, 46 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 024938d8..2abd4375 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
gprs \
gbproxy \
+ gtphub \
$(NULL)
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 8f7f054e..e5d50d37 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -56,7 +56,6 @@ libcommon_la_LIBADD = \
bin_PROGRAMS = \
osmo-sgsn \
- osmo-gtphub \
$(NULL)
osmo_sgsn_SOURCES = \
@@ -103,21 +102,3 @@ osmo_sgsn_LDADD += \
$(LIBASN1C_LIBS) \
$(NULL)
endif
-
-osmo_gtphub_SOURCES = \
- gtphub_main.c \
- gtphub.c \
- gtphub_sock.c \
- gtphub_ares.c \
- gtphub_vty.c \
- $(NULL)
-osmo_gtphub_LDADD = \
- libcommon.la \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOVTY_LIBS) \
- $(LIBCARES_LIBS) \
- $(LIBGTP_LIBS) \
- $(LIBOSMOSIGTRAN_LIBS) \
- -lrt \
- $(NULL)
diff --git a/src/gtphub/Makefile.am b/src/gtphub/Makefile.am
new file mode 100644
index 00000000..a242a058
--- /dev/null
+++ b/src/gtphub/Makefile.am
@@ -0,0 +1,45 @@
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ -fno-strict-aliasing \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOGSUPCLIENT_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBGTP_CFLAGS) \
+ $(NULL)
+if BUILD_IU
+AM_CFLAGS += \
+ $(LIBASN1C_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMORANAP_CFLAGS) \
+ $(NULL)
+endif
+
+bin_PROGRAMS = osmo-gtphub
+
+osmo_gtphub_SOURCES = \
+ gtphub_main.c \
+ gtphub.c \
+ gtphub_sock.c \
+ gtphub_ares.c \
+ gtphub_vty.c \
+ $(NULL)
+
+osmo_gtphub_LDADD = \
+ $(top_builddir)/src/gprs/sgsn_ares.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBCARES_LIBS) \
+ $(LIBGTP_LIBS) \
+ $(LIBOSMOSIGTRAN_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/src/gprs/gtphub.c b/src/gtphub/gtphub.c
index ca5857b3..ca5857b3 100644
--- a/src/gprs/gtphub.c
+++ b/src/gtphub/gtphub.c
diff --git a/src/gprs/gtphub_ares.c b/src/gtphub/gtphub_ares.c
index 87dc860c..87dc860c 100644
--- a/src/gprs/gtphub_ares.c
+++ b/src/gtphub/gtphub_ares.c
diff --git a/src/gprs/gtphub_main.c b/src/gtphub/gtphub_main.c
index f693f099..f693f099 100644
--- a/src/gprs/gtphub_main.c
+++ b/src/gtphub/gtphub_main.c
diff --git a/src/gprs/gtphub_sock.c b/src/gtphub/gtphub_sock.c
index 1acd5a62..1acd5a62 100644
--- a/src/gprs/gtphub_sock.c
+++ b/src/gtphub/gtphub_sock.c
diff --git a/src/gprs/gtphub_vty.c b/src/gtphub/gtphub_vty.c
index abc08fd6..abc08fd6 100644
--- a/src/gprs/gtphub_vty.c
+++ b/src/gtphub/gtphub_vty.c