build: remove unused all_includes and use AM_CPPFLAGS

Preprocessor flags are best placed in AM_CPPFLAGS. Remove use of the
unused all_includes variable, which is never set.
This commit is contained in:
Jan Engelhardt 2013-06-03 01:59:25 +02:00 committed by Holger Hans Peter Freyther
parent a6d83932ba
commit 9ffeb9756a
8 changed files with 14 additions and 8 deletions

View File

@ -1,6 +1,5 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src src/vty src/codec src/gsm src/gb src/ctrl tests utils SUBDIRS = include src src/vty src/codec src/gsm src/gb src/ctrl tests utils
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

View File

@ -2,7 +2,8 @@
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=5:0:0 LIBVERSION=5:0:0
AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall
lib_LTLIBRARIES = libosmocore.la lib_LTLIBRARIES = libosmocore.la

View File

@ -2,7 +2,8 @@
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=0:0:0 LIBVERSION=0:0:0
AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = -Wall
lib_LTLIBRARIES = libosmocodec.la lib_LTLIBRARIES = libosmocodec.la

View File

@ -2,7 +2,8 @@
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=3:1:0 LIBVERSION=3:1:0
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing
# FIXME: this should eventually go into a milenage/Makefile.am # FIXME: this should eventually go into a milenage/Makefile.am
noinst_HEADERS = common_vty.h noinst_HEADERS = common_vty.h

View File

@ -2,7 +2,8 @@
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=6:0:1 LIBVERSION=6:0:1
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN}
# FIXME: this should eventually go into a milenage/Makefile.am # FIXME: this should eventually go into a milenage/Makefile.am
noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \ noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \

View File

@ -2,7 +2,8 @@
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=0:1:0 LIBVERSION=0:1:0
AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall
if ENABLE_VTY if ENABLE_VTY
lib_LTLIBRARIES = libosmovty.la lib_LTLIBRARIES = libosmovty.la

View File

@ -1,4 +1,5 @@
AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = -Wall
check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \ check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \
smscb/smscb_test bits/bitrev_test a5/a5_test \ smscb/smscb_test bits/bitrev_test a5/a5_test \

View File

@ -1,5 +1,6 @@
if ENABLE_UTILITIES if ENABLE_UTILITIES
AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = -Wall
bin_PROGRAMS = osmo-arfcn osmo-auc-gen bin_PROGRAMS = osmo-arfcn osmo-auc-gen