mirror of https://gerrit.osmocom.org/libosmocore
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: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bdchanges/18/31018/1
parent
a50ed5fda8
commit
88955fb550
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <osmocom/core/gsmtap_util.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
* and call a queue-specific callback function.
|
||||
*/
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifdef HAVE_SYS_EVENTFD_H
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*
|
||||
* \file logging.c */
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
* @{
|
||||
* \file logging_gsmtap.c */
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
* @{
|
||||
* \file logging_syslog.c */
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifdef HAVE_SYSLOG_H
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
* @{
|
||||
* \file plugin.c */
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
/*! \addtogroup socket
|
||||
* @{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "../../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -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: */
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "../../config.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
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)
|
||||
AM_LDFLAGS = -no-install
|
||||
LDADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/core/bits.h>
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
void *ctx = NULL;
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/core/bits.h>
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
void *ctx = NULL;
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <osmocom/core/select.h>
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
|
||||
static void main_timer_fired(void *data);
|
||||
static void secondary_timer_fired(void *data);
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <osmocom/vty/stats.h>
|
||||
#include <osmocom/vty/misc.h>
|
||||
|
||||
#include "../../config.h"
|
||||
#include "config.h"
|
||||
|
||||
void *tall_statdummy_ctx = NULL;
|
||||
static bool quit = false;
|
||||
|
|
Loading…
Reference in New Issue