From 6a973bab9c5ae4f139ce30aa02e34e3779b8c5fa Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 26 Sep 2018 20:49:48 +0200 Subject: 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 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 in a local build, but #include 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 might not get a notice that the header didn't exist, but might instead include an older system-installed file. Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') 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 -- cgit v1.2.3