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
This commit is contained in:
parent
bb6e4bb676
commit
6a973bab9c
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
SUBDIRS = sccp mtp osmocom
|
||||
SUBDIRS = osmocom
|
||||
|
|
|
@ -1 +1 @@
|
|||
SUBDIRS = sigtran
|
||||
SUBDIRS = mtp sccp sigtran
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <mtp/mtp_pcap.h>
|
||||
#include <osmocom/mtp/mtp_pcap.h>
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/gsm/tlv.h>
|
||||
|
||||
#include <sccp/sccp.h>
|
||||
#include <osmocom/sccp/sccp.h>
|
||||
|
||||
// Unassigned debug area
|
||||
static int DSCCP = 0;
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <sccp/sccp.h>
|
||||
#include <osmocom/sccp/sccp.h>
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
#include <osmocom/sigtran/protocol/sua.h>
|
||||
#include <sccp/sccp_types.h>
|
||||
#include <osmocom/sccp/sccp_types.h>
|
||||
|
||||
#include "xua_internal.h"
|
||||
#include "sccp_internal.h"
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
#include <osmocom/sigtran/protocol/sua.h>
|
||||
#include <sccp/sccp_types.h>
|
||||
#include <osmocom/sccp/sccp_types.h>
|
||||
|
||||
#include "xua_internal.h"
|
||||
#include "sccp_internal.h"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/core/msgb.h>
|
||||
|
||||
#include <sccp/sccp_types.h>
|
||||
#include <osmocom/sccp/sccp_types.h>
|
||||
#include <osmocom/sigtran/osmo_ss7.h>
|
||||
#include <osmocom/sigtran/sccp_sap.h>
|
||||
#include <osmocom/sigtran/sccp_helpers.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* MTP Layer3 parsing tests */
|
||||
#include <mtp/mtp_level3.h>
|
||||
#include <osmocom/mtp/mtp_level3.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <osmocom/core/msgb.h>
|
||||
#include <osmocom/core/utils.h>
|
||||
|
||||
#include <sccp/sccp.h>
|
||||
#include <osmocom/sccp/sccp.h>
|
||||
|
||||
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|
||||
|
||||
|
|
Loading…
Reference in New Issue