diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-01-18 18:54:00 +0100 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-01-18 19:04:36 +0100 |
commit | 88955fb5506280a82860b026f8d7db9ad57bb504 (patch) | |
tree | 7224ed78844d412e84eba20a3b0d4391ac9f09aa /src | |
parent | a50ed5fda813eafa3a01bb998960d38ed11a3591 (diff) |
Fix all references to config.h
config.h is created in $(top_buildir)/config.h.
Let's make sure all CPPFLAGS add correct -Ipath includes,
and that all code includes the correct file.
Change-Id: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bd
Diffstat (limited to 'src')
-rw-r--r-- | src/codec/Makefile.am | 2 | ||||
-rw-r--r-- | src/coding/Makefile.am | 4 | ||||
-rw-r--r-- | src/core/Makefile.am | 2 | ||||
-rw-r--r-- | src/core/gsmtap_util.c | 2 | ||||
-rw-r--r-- | src/core/it_q.c | 2 | ||||
-rw-r--r-- | src/core/logging.c | 2 | ||||
-rw-r--r-- | src/core/logging_gsmtap.c | 2 | ||||
-rw-r--r-- | src/core/logging_syslog.c | 2 | ||||
-rw-r--r-- | src/core/panic.c | 2 | ||||
-rw-r--r-- | src/core/plugin.c | 2 | ||||
-rw-r--r-- | src/core/select.c | 2 | ||||
-rw-r--r-- | src/core/socket.c | 2 | ||||
-rw-r--r-- | src/core/utils.c | 2 | ||||
-rw-r--r-- | src/ctrl/Makefile.am | 2 | ||||
-rw-r--r-- | src/gb/Makefile.am | 2 | ||||
-rw-r--r-- | src/gsm/gsm0411_utils.c | 2 | ||||
-rw-r--r-- | src/gsm/gsm_utils.c | 2 | ||||
-rw-r--r-- | src/gsm/kdf.c | 2 | ||||
-rw-r--r-- | src/gsm/mncc.c | 2 | ||||
-rw-r--r-- | src/pseudotalloc/Makefile.am | 2 | ||||
-rw-r--r-- | src/sim/Makefile.am | 2 | ||||
-rw-r--r-- | src/usb/Makefile.am | 2 | ||||
-rw-r--r-- | src/vty/Makefile.am | 2 | ||||
-rw-r--r-- | src/vty/cpu_sched_vty.c | 2 | ||||
-rw-r--r-- | src/vty/fsm_vty.c | 2 | ||||
-rw-r--r-- | src/vty/logging_vty.c | 2 | ||||
-rw-r--r-- | src/vty/stats_vty.c | 2 |
27 files changed, 29 insertions, 27 deletions
diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index c16ce9ad..f05ac1f7 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:3 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index d856918c..42b16e80 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -5,7 +5,9 @@ LIBVERSION=2:0:2 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ - -I"$(top_builddir)/include" + -I"$(top_builddir)/include" \ + -I"$(top_builddir)" \ + $(NULL) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 2cfb2810..9b812cef 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=19:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index 2571b859..cb7538b6 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -19,7 +19,7 @@ * */ -#include "../config.h" +#include "config.h" #include <osmocom/core/gsmtap_util.h> #include <osmocom/core/logging.h> diff --git a/src/core/it_q.c b/src/core/it_q.c index fda6c1ff..a3ff420c 100644 --- a/src/core/it_q.c +++ b/src/core/it_q.c @@ -32,7 +32,7 @@ * and call a queue-specific callback function. */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYS_EVENTFD_H diff --git a/src/core/logging.c b/src/core/logging.c index ce42e4c9..938c65f2 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -25,7 +25,7 @@ * * \file logging.c */ -#include "../config.h" +#include "config.h" #include <stdarg.h> #include <stdlib.h> diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index cc95388f..dfd059b7 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -27,7 +27,7 @@ * @{ * \file logging_gsmtap.c */ -#include "../config.h" +#include "config.h" #include <stdarg.h> #include <stdlib.h> diff --git a/src/core/logging_syslog.c b/src/core/logging_syslog.c index 20908564..1153bdf4 100644 --- a/src/core/logging_syslog.c +++ b/src/core/logging_syslog.c @@ -22,7 +22,7 @@ * @{ * \file logging_syslog.c */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYSLOG_H diff --git a/src/core/panic.c b/src/core/panic.c index 6c925229..bbf6d081 100644 --- a/src/core/panic.c +++ b/src/core/panic.c @@ -27,7 +27,7 @@ #include <osmocom/core/panic.h> #include <osmocom/core/backtrace.h> -#include "../config.h" +#include "config.h" static osmo_panic_handler_t osmo_panic_handler = (void*)0; diff --git a/src/core/plugin.c b/src/core/plugin.c index 5f44a407..687ad406 100644 --- a/src/core/plugin.c +++ b/src/core/plugin.c @@ -23,7 +23,7 @@ * @{ * \file plugin.c */ -#include "../config.h" +#include "config.h" #if HAVE_DLFCN_H diff --git a/src/core/select.c b/src/core/select.c index 026d4572..72f794f3 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -36,7 +36,7 @@ #include <osmocom/core/stat_item.h> #include <osmocom/core/stats_tcp.h> -#include "../config.h" +#include "config.h" #if defined(HAVE_SYS_SELECT_H) && defined(HAVE_POLL_H) #include <sys/select.h> diff --git a/src/core/socket.c b/src/core/socket.c index ee49c279..43736e08 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -17,7 +17,7 @@ * */ -#include "../config.h" +#include "config.h" /*! \addtogroup socket * @{ diff --git a/src/core/utils.c b/src/core/utils.c index 2012b740..231b65c9 100644 --- a/src/core/utils.c +++ b/src/core/utils.c @@ -459,7 +459,7 @@ char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len) __attribute__((weak, alias("osmo_hexdump_nospc"))); #endif -#include "../config.h" +#include "config.h" #ifdef HAVE_CTYPE_H #include <ctype.h> /*! Convert an entire string to lower case diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 20de7d6e..31340791 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=7:0:7 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_CTRL diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 32a03c83..1a269395 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=14:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall -fno-strict-aliasing \ $(TALLOC_CFLAGS) \ $(LIBMNL_CFLAGS) \ diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index ccefe546..c26cd825 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -27,7 +27,7 @@ * */ -#include "../../config.h" +#include "config.h" #include <time.h> #include <string.h> diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index bbc7dd64..48341ae5 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -92,7 +92,7 @@ #include <time.h> #include <unistd.h> -#include "../../config.h" +#include "config.h" #if (!EMBEDDED) /* FIXME: this can be removed once we bump glibc requirements to 2.25: */ diff --git a/src/gsm/kdf.c b/src/gsm/kdf.c index 6982f6f7..4113aada 100644 --- a/src/gsm/kdf.c +++ b/src/gsm/kdf.c @@ -22,7 +22,7 @@ #include <stdint.h> #include <string.h> -#include "../../config.h" +#include "config.h" #if (USE_GNUTLS) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index 938cf9a6..8a7dc4d6 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -20,7 +20,7 @@ * */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYS_SOCKET_H diff --git a/src/pseudotalloc/Makefile.am b/src/pseudotalloc/Makefile.am index 1b861836..030b281b 100644 --- a/src/pseudotalloc/Makefile.am +++ b/src/pseudotalloc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall if ENABLE_PSEUDOTALLOC diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 51424c72..dee59bb2 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:1 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index b097aa75..c7d7a2a2 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:1:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index c2d133ae..3da09197 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=11:0:2 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) if ENABLE_VTY diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 301e7a69..7198f747 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -25,7 +25,7 @@ #define _GNU_SOURCE -#include "../../config.h" +#include "config.h" #include <string.h> #include <stdlib.h> diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c index 777d38ce..da6038fa 100644 --- a/src/vty/fsm_vty.c +++ b/src/vty/fsm_vty.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 59c8a9cd..2a074222 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 299ec244..f940018f 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> |