aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2019-02-14 16:23:55 +0100
committerMax <msuraev@sysmocom.de>2019-02-14 16:35:36 +0100
commit1f2e69fd35ce5e04f7dacc5deec80a3892257c30 (patch)
tree8b8f6e5be4322353c77073eff21f953899eef78c
parentf0af1b051af6c17ef35b1a1f9519a54e5a67ad33 (diff)
Don't install pcuif_proto.h header
Both OsmoBTS and OsmoBSC use their own copies of this header nowadays so we can simplify our installation slightly by making it local only. Change-Id: I4a87395d4ab7212fe2fc055dae0a737e10d20c69
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--debian/osmo-pcu.install2
-rw-r--r--include/Makefile.am2
-rw-r--r--osmo-pcu.pc.in10
-rw-r--r--src/Makefile.am3
6 files changed, 1 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index fe94ea2..48051f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,3 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
@RELMAKE@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = osmo-pcu.pc
diff --git a/configure.ac b/configure.ac
index a1a610c..c3e2df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,6 @@ AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
AC_MSG_RESULT([LDFLAGS="$LDFLAGS"])
AC_OUTPUT(
- osmo-pcu.pc
include/Makefile
src/Makefile
doc/Makefile
diff --git a/debian/osmo-pcu.install b/debian/osmo-pcu.install
index 9b7eac6..603e0b1 100644
--- a/debian/osmo-pcu.install
+++ b/debian/osmo-pcu.install
@@ -1,6 +1,4 @@
etc/osmocom/osmo-pcu.cfg
lib/systemd/system/osmo-pcu.service
usr/bin/osmo-pcu
-usr/include/osmocom/pcu/pcuif_proto.h
-usr/lib/*/pkgconfig/osmo-pcu.pc
usr/share/doc/osmo-pcu/examples/osmo-pcu/osmo-pcu.cfg
diff --git a/include/Makefile.am b/include/Makefile.am
index e40a9c0..92896c6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,2 @@
-nobase_include_HEADERS = \
+noinst_HEADERS = \
osmocom/pcu/pcuif_proto.h
diff --git a/osmo-pcu.pc.in b/osmo-pcu.pc.in
deleted file mode 100644
index b72e9a8..0000000
--- a/osmo-pcu.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/
-
-Name: OsmoPCU
-Description: Osmocom PCU implementation
-Requires:
-Version: @VERSION@
-Cflags: -I${includedir}
diff --git a/src/Makefile.am b/src/Makefile.am
index b2f64f2..50e0eda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,9 +99,6 @@ 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