From 1f2e69fd35ce5e04f7dacc5deec80a3892257c30 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 14 Feb 2019 16:23:55 +0100 Subject: 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 --- Makefile.am | 3 --- configure.ac | 1 - debian/osmo-pcu.install | 2 -- include/Makefile.am | 2 +- osmo-pcu.pc.in | 10 ---------- src/Makefile.am | 3 --- 6 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 osmo-pcu.pc.in diff --git a/Makefile.am b/Makefile.am index fe94ea2a..48051f24 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 a1a610cc..c3e2df86 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 9b7eac6f..603e0b1f 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 e40a9c0a..92896c69 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 b72e9a8e..00000000 --- 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 b2f64f28..50e0eda5 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 -- cgit v1.2.3