[MERGED] osmo-pcu[master]: Install the pcuif_proto.h header file

historical

Harald Welte has submitted this change and it was merged.

Change subject: Install the pcuif_proto.h header file
......................................................................


Install the pcuif_proto.h header file

So far, we used to keep a copy of the header file around in
both osmo-pcu and osmo-bts projects.  Before we start introducing
a third copy in openbsc, let's have the osmo-pcu install the header
file and make the other programs use that.

Change-Id: I60976c9be5488256d1ff55fdc5aa548e3705400d
---
M Makefile.am
M configure.ac
A include/Makefile.am
R include/osmocom/pcu/pcuif_proto.h
M src/Makefile.am
M src/osmobts_sock.cpp
M src/pcu_l1_if.cpp
7 files changed, 10 insertions(+), 5 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved

diff --git a/Makefile.am b/Makefile.am
index 4cbc114..12cb478 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
-SUBDIRS = src examples tests
+SUBDIRS = include src examples tests
 EXTRA_DIST = osmoappdesc.py
 
diff --git a/configure.ac b/configure.ac
index 022a7f7..dcde2ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,7 @@
 AC_SUBST(STD_DEFINES_AND_INCLUDES)
 
 AC_OUTPUT(
+    include/Makefile
     src/Makefile
     examples/Makefile
     tests/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..e40a9c0
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,2 @@
+nobase_include_HEADERS = \
+	osmocom/pcu/pcuif_proto.h
diff --git a/src/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h
similarity index 100%
rename from src/pcuif_proto.h
rename to include/osmocom/pcu/pcuif_proto.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b047e7..7cc239b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGB_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGB_CFLAGS) $(LIBOSMOGSM_CFLAGS)
 
 if ENABLE_SYSMODSP
 AM_CPPFLAGS += -DENABLE_DIRECT_PHY
@@ -78,7 +78,6 @@
 	gprs_rlcmac.h \
 	gprs_ms.h \
 	gprs_ms_storage.h \
-	pcuif_proto.h \
 	pcu_l1_if.h \
 	gsm_timer.h \
 	bitvector.h \
@@ -98,6 +97,9 @@
 	gprs_coding_scheme.h \
 	egprs_rlc_compression.h
 
+nobase_include_HEADERS =
+	osmocom/pcu/pcuif_proto.h
+
 osmo_pcu_SOURCES = pcu_main.cpp
 
 if ENABLE_SYSMODSP
diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp
index 21a404f..f589dc2 100644
--- a/src/osmobts_sock.cpp
+++ b/src/osmobts_sock.cpp
@@ -35,7 +35,7 @@
 #include <pcu_l1_if.h>
 #include <gprs_debug.h>
 #include <gprs_bssgp_pcu.h>
-#include <pcuif_proto.h>
+#include <osmocom/pcu/pcuif_proto.h>
 #include <bts.h>
 #include <tbf.h>
 
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index fb17653..b892597 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -38,7 +38,7 @@
 #include <pcu_l1_if.h>
 #include <gprs_debug.h>
 #include <gprs_bssgp_pcu.h>
-#include <pcuif_proto.h>
+#include <osmocom/pcu/pcuif_proto.h>
 #include <bts.h>
 #include <tbf.h>
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60976c9be5488256d1ff55fdc5aa548e3705400d
Gerrit-PatchSet: 2
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>

