diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-01-15 19:26:06 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-01-15 20:14:01 +0100 |
| commit | 74b8cdb8e9d7112026ec3c6e346e5c667d261db3 (patch) | |
| tree | a9b7abb80a7fedc71b5853b9fd44bfb717744306 | |
| parent | 090550f5f812245aa3e66fea3f48b78efeccaaa9 (diff) | |
Make libcommon, libcommon-cs, libfilter, utils depend on mgcp/sigtran
The stow-enabled jenkins builds are currently failing like below:
make[3]: Entering directory '/build/src/libcommon'
CC bsc_version.o
CC common_vty.o
CC debug.o
CC gsm_data.o
In file included from debug.c:34:0:
../../include/osmocom/bsc/gsm_data.h:15:38: fatal error: osmocom/sigtran/sccp_sap.h: No such file or directory
#include <osmocom/sigtran/sccp_sap.h>
^
compilation terminated.
In file included from common_vty.c:27:0:
../../include/osmocom/bsc/gsm_data.h:15:38: fatal error: osmocom/sigtran/sccp_sap.h: No such file or directory
#include <osmocom/sigtran/sccp_sap.h>
^
compilation terminated.
In file included from gsm_data.c:37:0:
../../include/osmocom/bsc/gsm_data.h:15:38: fatal error: osmocom/sigtran/sccp_sap.h: No such file or directory
#include <osmocom/sigtran/sccp_sap.h>
^
compilation terminated.
Let's make sure the common gsm_data.h have all required CFLAGS to compile.
Change-Id: I30b75db6ffba227b05b5413b84b15f69e0c213f2
| -rw-r--r-- | include/osmocom/bsc/gsm_data.h | 4 | ||||
| -rw-r--r-- | src/libbsc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libcommon-cs/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libcommon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libfilter/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/bsc/Makefile.am | 1 |
6 files changed, 11 insertions, 1 deletions
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 0ff58117e..ed2a95c1c 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -12,12 +12,14 @@ #include <osmocom/core/stats.h> #include <osmocom/crypt/auth.h> -#include <osmocom/sigtran/sccp_sap.h> #include <osmocom/bsc/common.h> #include <osmocom/bsc/rest_octets.h> #include <osmocom/bsc/common_cs.h> +struct mgcp_client_conf; +struct mgcp_client; +struct mgcp_ctx; /** annotations for msgb ownership */ #define __uses diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index fc12d05d7..3ac1c0b80 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -10,6 +10,8 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOMGCP_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am index 21c27455d..8cca1d7ce 100644 --- a/src/libcommon-cs/Makefile.am +++ b/src/libcommon-cs/Makefile.am @@ -10,6 +10,7 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index ec997b76a..c66cbcdcd 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -10,6 +10,8 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMOLEGACYMGCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libfilter/Makefile.am b/src/libfilter/Makefile.am index 41a75bdd2..8b0597bc6 100644 --- a/src/libfilter/Makefile.am +++ b/src/libfilter/Makefile.am @@ -10,6 +10,8 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMOLEGACYMGCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index ebeb1edc0..9d95ead23 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -10,6 +10,7 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOLEGACYMGCP_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) |