From 68fc12775fac03e5e26a008dfa68c92498bfb772 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 16 Nov 2016 22:48:33 +0100
Subject: [PATCH] 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
---
 Makefile.am                                | 2 +-
 configure.ac                               | 1 +
 include/Makefile.am                        | 2 ++
 {src => include/osmocom/pcu}/pcuif_proto.h | 0
 src/Makefile.am                            | 6 ++++--
 src/osmobts_sock.cpp                       | 2 +-
 src/pcu_l1_if.cpp                          | 2 +-
 7 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 include/Makefile.am
 rename {src => include/osmocom/pcu}/pcuif_proto.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 4cbc1147..12cb478b 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 022a7f76..dcde2ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,7 @@ STD_DEFINES_AND_INCLUDES="-Wall"
 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 00000000..e40a9c0a
--- /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 9b047e70..7cc239bd 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 @@ noinst_HEADERS = \
 	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 @@ noinst_HEADERS = \
 	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 21a404fd..f589dc2a 100644
--- a/src/osmobts_sock.cpp
+++ b/src/osmobts_sock.cpp
@@ -35,7 +35,7 @@ extern "C" {
 #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 fb176538..b8925979 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -38,7 +38,7 @@ extern "C" {
 #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>