Move gtphub header to include/osmocom/gtphub/

Change-Id: I82e1f2a3bc8e22b28747a540879bd661f1704cde

12 files changed, 12 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index 64b74e3c9..2c335d75e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,6 +235,7 @@ AM_CONFIG_HEADER(bscconfig.h)
 AC_OUTPUT(
     include/Makefile
     include/osmocom/Makefile
+    include/osmocom/gtphub/Makefile
     include/osmocom/sgsn/Makefile
     src/Makefile
     src/gprs/Makefile
diff --git a/debian/copyright b/debian/copyright
index d4e745104..cd8d7e84c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -74,7 +74,7 @@ Files:     include/osmocom/sgsn/a_reset.h
            include/osmocom/sgsn/gprs_sndcp_pcomp.h
            include/osmocom/sgsn/gprs_sndcp_xid.h
            include/osmocom/sgsn/gprs_utils.h
-           include/osmocom/sgsn/gtphub.h
+           include/osmocom/gtphub/gtphub.h
            include/osmocom/sgsn/signal.h
            src/gprs/gprs_llc_parse.c
            src/gprs/crc24.c
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index 09db97a95..f5bc76a4f 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
+	gtphub \
 	sgsn \
 	$(NULL)
diff --git a/include/osmocom/gtphub/Makefile.am b/include/osmocom/gtphub/Makefile.am
new file mode 100644
index 000000000..c61dad9d4
--- /dev/null
+++ b/include/osmocom/gtphub/Makefile.am
@@ -0,0 +1,3 @@
+noinst_HEADERS = \
+	gtphub.h \
+	$(NULL)
diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/gtphub/gtphub.h
index 6a439b576..6a439b576 100644
--- a/include/osmocom/sgsn/gtphub.h
+++ b/include/osmocom/gtphub/gtphub.h
diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am
index a3bc21830..017954dac 100644
--- a/include/osmocom/sgsn/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
@@ -23,7 +23,6 @@ noinst_HEADERS = \
 	gprs_subscriber.h \
 	gprs_utils.h \
 	gtp.h \
-	gtphub.h \
 	gtp_ggsn.h \
 	gtp_mme.h \
 	pdpctx.h \
diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c
index 89ca67656..2b00f59fe 100644
--- a/src/gtphub/gtphub.c
+++ b/src/gtphub/gtphub.c
@@ -32,7 +32,7 @@
 #include <gtp.h>
 #include <gtpie.h>
 
-#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/gtphub/gtphub.h>
 #include <osmocom/sgsn/debug.h>
 #include <osmocom/sgsn/gprs_utils.h>
 
diff --git a/src/gtphub/gtphub_ares.c b/src/gtphub/gtphub_ares.c
index 87dc860c4..a2d8a4a12 100644
--- a/src/gtphub/gtphub_ares.c
+++ b/src/gtphub/gtphub_ares.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/gtphub/gtphub.h>
 #include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/utils.h>
diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c
index a9a7529cc..0f389ab6e 100644
--- a/src/gtphub/gtphub_main.c
+++ b/src/gtphub/gtphub_main.c
@@ -41,7 +41,7 @@
 #include <osmocom/vty/misc.h>
 
 #include <osmocom/sgsn/debug.h>
-#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/gtphub/gtphub.h>
 #include <osmocom/sgsn/vty.h>
 
 #include "../../bscconfig.h"
diff --git a/src/gtphub/gtphub_sock.c b/src/gtphub/gtphub_sock.c
index 183753348..59a0d42a4 100644
--- a/src/gtphub/gtphub_sock.c
+++ b/src/gtphub/gtphub_sock.c
@@ -25,7 +25,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/gtphub/gtphub.h>
 #include <osmocom/sgsn/debug.h>
 
 /* Convenience makro, note: only within this C file. */
diff --git a/src/gtphub/gtphub_vty.c b/src/gtphub/gtphub_vty.c
index abc08fd69..b5f102ae6 100644
--- a/src/gtphub/gtphub_vty.c
+++ b/src/gtphub/gtphub_vty.c
@@ -31,7 +31,7 @@
 #include <osmocom/vty/misc.h>
 
 #include <osmocom/sgsn/vty.h>
-#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/gtphub/gtphub.h>
 
 /* TODO split GRX ares from sgsn into a separate struct and allow use without
  * globals. */
diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c
index 13d2636b2..4f5831526 100644
--- a/tests/gtphub/gtphub_test.c
+++ b/tests/gtphub/gtphub_test.c
@@ -30,7 +30,7 @@
 
 #include <osmocom/sgsn/debug.h>
 
-#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/gtphub/gtphub.h>
 #include <gtp.h>
 #include <gtpie.h>