Since automake 1.13 INCLUDES is depricates and causes a warning
---
src/host/gsmmap/Makefile.am | 2 +-
src/host/layer23/src/common/Makefile.am | 2 +-
src/host/layer23/src/misc/Makefile.am | 2 +-
src/host/layer23/src/mobile/Makefile.am | 2 +-
src/host/osmocon/Makefile.am | 4 ++--
src/shared/libosmocore/Makefile.am | 2 +-
src/shared/libosmocore/src/Makefile.am | 2 +-
src/shared/libosmocore/src/codec/Makefile.am | 2 +-
src/shared/libosmocore/src/gb/Makefile.am | 2 +-
src/shared/libosmocore/src/gsm/Makefile.am | 2 +-
src/shared/libosmocore/src/vty/Makefile.am | 2 +-
src/shared/libosmocore/tests/Makefile.am | 2 +-
src/shared/libosmocore/utils/Makefile.am | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/host/gsmmap/Makefile.am b/src/host/gsmmap/Makefile.am
index 29be15c..aceb8e5 100644
--- a/src/host/gsmmap/Makefile.am
+++ b/src/host/gsmmap/Makefile.am
@@ -7,7 +7,7 @@ $(top_srcdir)/.version:
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
-INCLUDES = $(all_includes) -I../layer23/include -DHOST_BUILD
+AM_CPPFLAGS = $(all_includes) -I../layer23/include -DHOST_BUILD
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
sbin_PROGRAMS = gsmmap
diff --git a/src/host/layer23/src/common/Makefile.am
b/src/host/layer23/src/common/Makefile.am
index 8d96ed2..71081c0 100644
--- a/src/host/layer23/src/common/Makefile.am
+++ b/src/host/layer23/src/common/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS)
noinst_LIBRARIES = liblayer23.a
diff --git a/src/host/layer23/src/misc/Makefile.am
b/src/host/layer23/src/misc/Makefile.am
index d8fb322..9c2bc4d 100644
--- a/src/host/layer23/src/misc/Makefile.am
+++ b/src/host/layer23/src/misc/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS)
LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
$(LIBOSMOCODEC_LIBS) $(LIBGPS_LIBS)
diff --git a/src/host/layer23/src/mobile/Makefile.am
b/src/host/layer23/src/mobile/Makefile.am
index 8920c54..04dd025 100644
--- a/src/host/layer23/src/mobile/Makefile.am
+++ b/src/host/layer23/src/mobile/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS)
LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOGSM_LIBS)
$(LIBOSMOCODEC_LIBS) $(LIBGPS_LIBS)
diff --git a/src/host/osmocon/Makefile.am b/src/host/osmocon/Makefile.am
index 8b0d4bf..28487ff 100644
--- a/src/host/osmocon/Makefile.am
+++ b/src/host/osmocon/Makefile.am
@@ -7,13 +7,13 @@ $(top_srcdir)/.version:
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
sbin_PROGRAMS = osmocon osmoload
# FIXME: sercomm needs to move into libosmocore or another shared lib
-INCLUDES += -I../../target/firmware/include/comm -I../../target/firmware/apps
-DHOST_BUILD
+AM_CPPFLAGS += -I../../target/firmware/include/comm -I../../target/firmware/apps
-DHOST_BUILD
osmocon_SOURCES = osmocon.c tpu_debug.c ../../target/firmware/comm/sercomm.c
osmocon_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/shared/libosmocore/Makefile.am b/src/shared/libosmocore/Makefile.am
index c9b7ccd..a77bd8f 100644
--- a/src/shared/libosmocore/Makefile.am
+++ b/src/shared/libosmocore/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src src/vty src/codec src/gsm src/gb tests utils
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/shared/libosmocore/src/Makefile.am
b/src/shared/libosmocore/src/Makefile.am
index d719df7..c75ae03 100644
--- a/src/shared/libosmocore/src/Makefile.am
+++ b/src/shared/libosmocore/src/Makefile.am
@@ -2,7 +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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall
lib_LTLIBRARIES = libosmocore.la
diff --git a/src/shared/libosmocore/src/codec/Makefile.am
b/src/shared/libosmocore/src/codec/Makefile.am
index 665768c..6f886f1 100644
--- a/src/shared/libosmocore/src/codec/Makefile.am
+++ b/src/shared/libosmocore/src/codec/Makefile.am
@@ -2,7 +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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall
lib_LTLIBRARIES = libosmocodec.la
diff --git a/src/shared/libosmocore/src/gb/Makefile.am
b/src/shared/libosmocore/src/gb/Makefile.am
index 04d2108..eaa8321 100644
--- a/src/shared/libosmocore/src/gb/Makefile.am
+++ b/src/shared/libosmocore/src/gb/Makefile.am
@@ -2,7 +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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing
# FIXME: this should eventually go into a milenage/Makefile.am
diff --git a/src/shared/libosmocore/src/gsm/Makefile.am
b/src/shared/libosmocore/src/gsm/Makefile.am
index 0544e0a..36e7830 100644
--- a/src/shared/libosmocore/src/gsm/Makefile.am
+++ b/src/shared/libosmocore/src/gsm/Makefile.am
@@ -2,7 +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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN}
# FIXME: this should eventually go into a milenage/Makefile.am
diff --git a/src/shared/libosmocore/src/vty/Makefile.am
b/src/shared/libosmocore/src/vty/Makefile.am
index 6111123..9435ae3 100644
--- a/src/shared/libosmocore/src/vty/Makefile.am
+++ b/src/shared/libosmocore/src/vty/Makefile.am
@@ -2,7 +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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall
if ENABLE_VTY
diff --git a/src/shared/libosmocore/tests/Makefile.am
b/src/shared/libosmocore/tests/Makefile.am
index aaad0c8..b108cbc 100644
--- a/src/shared/libosmocore/tests/Makefile.am
+++ b/src/shared/libosmocore/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(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/src/shared/libosmocore/utils/Makefile.am
b/src/shared/libosmocore/utils/Makefile.am
index 4e7869e..9ed4cb0 100644
--- a/src/shared/libosmocore/utils/Makefile.am
+++ b/src/shared/libosmocore/utils/Makefile.am
@@ -1,5 +1,5 @@
if ENABLE_UTILITIES
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
noinst_PROGRAMS = osmo-arfcn osmo-auc-gen
osmo_arfcn_SOURCES = osmo-arfcn.c
--
1.7.10.4