summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-09-26 20:49:48 +0200
committerHarald Welte <laforge@gnumonks.org>2018-10-21 12:35:11 +0000
commit6a973bab9c5ae4f139ce30aa02e34e3779b8c5fa (patch)
treeded217a4262656d32b417b8e53f837b3539e03c5 /configure.ac
parentbb6e4bb6769eb1fc7840e50d0b33126ba7574b29 (diff)
build: move include/{mtp,sccp} to include/osmocom/
Anywhere else in the Osmocom code base, we arrange headers in include/osmocom/foo/ and pass -I ${root_srcdir}/include/. This way including an osmocom header always has the format #include <osmocom/foo/bar.h> whether we are including from the local source tree or from $prefix. For some reason not clear to me, the mtp and sccp folders, even though they are being installed to $prefix/include/osmocom/, were kept *next* to the osmocom/ dir, instead of inside it. Fix that weird situation. The motivation is that I wanted to use a definition from sccp_types.h in a public-API header. That is impossible if it requires #include <sccp/sccp_types.h> in a local build, but #include <osmocom/sccp/sccp_types.h> for any other source tree using libosmo-sccp. After this patch, both are identical and including works without quirks. (The other patch that needed this has changed in the meantime on and no longer needs this, but this still makes sense for future hacking.) The installed result does not change, since both mtp/*.h and sccp/*.h have always been installed to $prefix/include/osmocom/{mtp,sccp}/. This merely changes their position in the source tree. The most curious situation before this is that any patch #including <osmocom/sccp/sccp_types.h> might not get a notice that the header didn't exist, but might instead include an older system-installed file. Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7dfb266..acef6f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,9 +136,9 @@ AC_OUTPUT(
libosmo-sccp.pc
libosmo-mtp.pc
libosmo-xua.pc
- include/sccp/Makefile
- include/mtp/Makefile
include/osmocom/Makefile
+ include/osmocom/sccp/Makefile
+ include/osmocom/mtp/Makefile
include/osmocom/sigtran/Makefile
include/Makefile
src/Makefile