build: Don't use the deprecated INCLUDES in the various Makefile.am

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

7 files changed, 8 insertions, 12 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d719df7c..b425ea19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,7 @@
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
 LIBVERSION=4:0:0
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libosmocore.la
 
diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am
index 665768c6..6110cbf7 100644
--- a/src/codec/Makefile.am
+++ b/src/codec/Makefile.am
@@ -2,8 +2,7 @@
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
 LIBVERSION=0:0:0
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libosmocodec.la
 
diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am
index 04d21085..8b7473db 100644
--- a/src/gb/Makefile.am
+++ b/src/gb/Makefile.am
@@ -2,8 +2,7 @@
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
 LIBVERSION=2:0:0
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing
+AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(all_includes) -I$(top_srcdir)/include
 
 # FIXME: this should eventually go into a milenage/Makefile.am
 noinst_HEADERS = common_vty.h
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 0544e0a1..6e2a785e 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -2,8 +2,7 @@
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
 LIBVERSION=3:0:0
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN}
+AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include
 
 # FIXME: this should eventually go into a milenage/Makefile.am
 noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \
diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am
index 61111235..76d7f271 100644
--- a/src/vty/Makefile.am
+++ b/src/vty/Makefile.am
@@ -2,8 +2,7 @@
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
 LIBVERSION=0:0:0
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
 
 if ENABLE_VTY
 lib_LTLIBRARIES = libosmovty.la
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aaad0c84..cd3337d0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
 
 check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test		\
                  smscb/smscb_test bits/bitrev_test a5/a5_test		\
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ae001da4..6a3cd12e 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,6 @@
 if ENABLE_UTILITIES
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
+
 bin_PROGRAMS = osmo-arfcn osmo-auc-gen
 
 osmo_arfcn_SOURCES = osmo-arfcn.c