Makefiles - use AM_CPPFLAGS instead INCLUDES

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/Makefile.am b/Makefile.am
index 21d69abbbd5a6d62db026aa2bc39590e8e478230..f25eee2e38ff921a891de49f14ac74254407f443 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 SUBDIRS = include alsactl alsaucm utils m4 po
 if ALSAMIXER

diff --git a/alsaloop/Makefile.am b/alsaloop/Makefile.am
index a6949116f701a296a01036365ba23f3761df8c7e..4cdf20b2321898bbfbdfec4dc0fc609eb5f79a8c 100644 (file)
--- a/alsaloop/Makefile.am
+++ b/alsaloop/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = -lm
 AM_CFLAGS = -D_GNU_SOURCE
 if HAVE_SAMPLERATE

diff --git a/alsamixer/Makefile.am b/alsamixer/Makefile.am
index 8a82323a5d1a4cf2edd8d621f33b6c577874a3cb..259b29ecf6819d3f000b93d9cb22b431e0b9f205 100644 (file)
--- a/alsamixer/Makefile.am
+++ b/alsamixer/Makefile.am
@@ -19,7 +19,7 @@ alsamixer_SOURCES = card_select.c card_select.h \
                widget.c widget.h
 man_MANS = alsamixer.1
 EXTRA_DIST = alsamixer.1
-alsamixer_INCLUDES = -I$(top_srcdir)/include
+alsamixer_CPPFLAGS = -I$(top_srcdir)/include
 
 #LDFLAGS = -static
 #CFLAGS += -g -Wall

diff --git a/alsaucm/Makefile.am b/alsaucm/Makefile.am
index 4eba677f414a7a6f283d873fcbd3c814e556b48f..c180d4ad8ed5b6d6860e14240f1f513869d70cad 100644 (file)
--- a/alsaucm/Makefile.am
+++ b/alsaucm/Makefile.am
@@ -3,11 +3,11 @@ bin_PROGRAMS = \
 
 alsaucm_SOURCES = usecase.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
          -Wall -I$(top_srcdir)/include
 
 alsaucm_LDADD = -lasound
 
 # local build
-INCLUDES += -I$(top_srcdir)/../alsa-lib/include
+AM_CPPFLAGS += -I$(top_srcdir)/../alsa-lib/include
 alsaucm_LDADD += -L$(top_srcdir)/../alsa-lib/src/.libs

diff --git a/amidi/Makefile.am b/amidi/Makefile.am
index 0b31a6768527cba5196755aba7ba7a50c68db3f2..0b91685423553fe29e989c9ce63f2256bdcfe186 100644 (file)
--- a/amidi/Makefile.am
+++ b/amidi/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 EXTRA_DIST = amidi.1
 
 bin_PROGRAMS = amidi

diff --git a/amixer/Makefile.am b/amixer/Makefile.am
index ba67a579a580cce0f96544748081674991c681f4..0343c8e1e58a1698fc59ce37a679f2300083b930 100644 (file)
--- a/amixer/Makefile.am
+++ b/amixer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = -lm
 # LDFLAGS = -static
 # CFLAGS += -g -Wall

diff --git a/aplay/Makefile.am b/aplay/Makefile.am
index 92323d1b1220648c10b82ef09183a9312d167591..c3256e94ea82c0ae009aa857e8ec8a3c2516e30e 100644 (file)
--- a/aplay/Makefile.am
+++ b/aplay/Makefile.am
@@ -1,6 +1,6 @@
 LIBRT = @LIBRT@
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = $(LIBINTL) $(LIBRT)
 
 # debug flags

diff --git a/iecset/Makefile.am b/iecset/Makefile.am
index c03a7f12e599c431df2fe7cb668cab60ddcd9079..8c80f90cc4986b42f49bf05a8e821192bdbc97de 100644 (file)
--- a/iecset/Makefile.am
+++ b/iecset/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = -lm
 # LDFLAGS = -static
 # CFLAGS += -g -Wall

diff --git a/include/Makefile.am b/include/Makefile.am
index 7a3968d7d66d96b8153fd8f6db745b38c2fb7c13..9d354e34a7186e93778c26b85cbd10e4517327cc 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -22,4 +22,4 @@ stamp-vh: $(top_builddir)/configure.in
               echo timestamp > stamp-vh)
        -@rm -f ver.tmp
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include

diff --git a/seq/aconnect/Makefile.am b/seq/aconnect/Makefile.am
index 507b9fecc3c203126b44354d32ce632b8ce84223..02be5c5bfd647c202797b2f7bc46ecd9584ebdcf 100644 (file)
--- a/seq/aconnect/Makefile.am
+++ b/seq/aconnect/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 EXTRA_DIST = README.aconnect aconnect.1
 LDADD = $(LIBINTL)
 

diff --git a/seq/aplaymidi/Makefile.am b/seq/aplaymidi/Makefile.am
index bed2a0ef5e2319d672c915638f7ea1132b8fc875..1fa063e8c15dce6de37e5d8f3c6654a37fc6f32e 100644 (file)
--- a/seq/aplaymidi/Makefile.am
+++ b/seq/aplaymidi/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 EXTRA_DIST = aplaymidi.1 arecordmidi.1
 
 bin_PROGRAMS = aplaymidi arecordmidi

diff --git a/seq/aseqdump/Makefile.am b/seq/aseqdump/Makefile.am
index d918d9f7a16c1ced1865ee36bd1b27535ed029f9..4837ad9b18d1786e24d47c686c86b901da16676f 100644 (file)
--- a/seq/aseqdump/Makefile.am
+++ b/seq/aseqdump/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 EXTRA_DIST = aseqdump.1
 
 bin_PROGRAMS = aseqdump

diff --git a/seq/aseqnet/Makefile.am b/seq/aseqnet/Makefile.am
index 2ebc4a56322e460630bd79a80cbf42fd37a8bc9a..852d1e91a444b0533d6ad6336eeaa683fe13f11a 100644 (file)
--- a/seq/aseqnet/Makefile.am
+++ b/seq/aseqnet/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 EXTRA_DIST = README.aseqnet aseqnet.1
 
 bin_PROGRAMS = aseqnet

diff --git a/speaker-test/Makefile.am b/speaker-test/Makefile.am
index e3551bcbe4594c51c27bff827767060a16ada6a5..d53dbd6815563afca23e4ff8fb2e5db8bcf43ec9 100644 (file)
--- a/speaker-test/Makefile.am
+++ b/speaker-test/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 SUBDIRS= samples
 LDADD = $(LIBINTL) -lm