diff options
| author | Harald Welte <laforge@gnumonks.org> | 2016-11-16 22:48:33 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-11-17 21:09:55 +0100 |
| commit | 68fc12775fac03e5e26a008dfa68c92498bfb772 (patch) | |
| tree | a14f73f0bb16bde00828bfba2911ebeeafb0e68f | |
| parent | 5d93f0f4eceda7bef29e27e6ec521c1e56640c25 (diff) | |
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
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/osmocom/pcu/pcuif_proto.h (renamed from src/pcuif_proto.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/osmobts_sock.cpp | 2 | ||||
| -rw-r--r-- | src/pcu_l1_if.cpp | 2 |
7 files changed, 10 insertions, 5 deletions
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 index 944f3644..944f3644 100644 --- a/src/pcuif_proto.h +++ b/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> |