[MERGED] openbsc[master]: Moving grs_sndcp.h header file to include

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Moving grs_sndcp.h header file to include
......................................................................


Moving grs_sndcp.h header file to include

For some reason gprs_sndcp.h is located in src/gprs. This commit moves
gprs_sndcp.h to include/openbsc and fixes the include path in
gprs_sndcp.c and gprs_sndcp_vty.c

Change-Id: If4e4f1252c81d7907c1b4d738c982bb172b128c9
---
M openbsc/include/openbsc/Makefile.am
R openbsc/include/openbsc/gprs_sndcp.h
M openbsc/src/gprs/Makefile.am
M openbsc/src/gprs/gprs_sndcp.c
M openbsc/src/gprs/gprs_sndcp_vty.c
5 files changed, 3 insertions(+), 7 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 11f650d..ce5f768 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -18,7 +18,7 @@
 		 gprs_gb_parse.h smpp.h meas_feed.h \
 		 gprs_gsup_client.h bsc_msg_filter.h \
 		 oap.h oap_messages.h \
-		 gtphub.h gprs_llc_xid.h
+		 gtphub.h gprs_llc_xid.h gprs_sndcp.h
 
 openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h
 openbscdir = $(includedir)/openbsc
diff --git a/openbsc/src/gprs/gprs_sndcp.h b/openbsc/include/openbsc/gprs_sndcp.h
similarity index 100%
rename from openbsc/src/gprs/gprs_sndcp.h
rename to openbsc/include/openbsc/gprs_sndcp.h
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 8cbdd91..1b6de46 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -6,8 +6,6 @@
 OSMO_LIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
 	    $(LIBOSMOCTRL_LIBS) $(LIBOSMOGB_LIBS)
 
-noinst_HEADERS = gprs_sndcp.h
-
 bin_PROGRAMS = osmo-gbproxy
 
 if HAVE_LIBGTP
diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c
index 75f95c9..4f71121 100644
--- a/openbsc/src/gprs/gprs_sndcp.c
+++ b/openbsc/src/gprs/gprs_sndcp.c
@@ -34,8 +34,7 @@
 #include <openbsc/debug.h>
 #include <openbsc/gprs_llc.h>
 #include <openbsc/sgsn.h>
-
-#include "gprs_sndcp.h"
+#include <openbsc/gprs_sndcp.h>
 
 /* Chapter 7.2: SN-PDU Formats */
 struct sndcp_common_hdr {
diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c
index deeef07..430881f 100644
--- a/openbsc/src/gprs/gprs_sndcp_vty.c
+++ b/openbsc/src/gprs/gprs_sndcp_vty.c
@@ -35,8 +35,7 @@
 #include <openbsc/debug.h>
 #include <openbsc/signal.h>
 #include <openbsc/gprs_llc.h>
-
-#include "gprs_sndcp.h"
+#include <openbsc/gprs_sndcp.h>
 
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>

-- 
To view, visit https://gerrit.osmocom.org/636
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4e4f1252c81d7907c1b4d738c982bb172b128c9
Gerrit-PatchSet: 9
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>