summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2014-05-07 09:43:45 +0200
committerJaroslav Kysela <perex@perex.cz>2014-05-07 10:55:59 +0200
commit0a6c9e80f79b5bcb24571cec55b8c8bfe49996c9 (patch)
treea9799d5f3b908241dac17456ae068fcc9a021466
parent3f9712b9cdb7320452f457805286b8e15632312e (diff)
Makefiles - use AM_CPPFLAGS instead INCLUDES
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--Makefile.am2
-rw-r--r--alsaloop/Makefile.am2
-rw-r--r--alsamixer/Makefile.am2
-rw-r--r--alsaucm/Makefile.am4
-rw-r--r--amidi/Makefile.am2
-rw-r--r--amixer/Makefile.am2
-rw-r--r--aplay/Makefile.am2
-rw-r--r--iecset/Makefile.am2
-rw-r--r--include/Makefile.am2
-rw-r--r--seq/aconnect/Makefile.am2
-rw-r--r--seq/aplaymidi/Makefile.am2
-rw-r--r--seq/aseqdump/Makefile.am2
-rw-r--r--seq/aseqnet/Makefile.am2
-rw-r--r--speaker-test/Makefile.am2
14 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 21d69ab..f25eee2 100644
--- 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 a694911..4cdf20b 100644
--- 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 8a82323..259b29e 100644
--- 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 4eba677..c180d4a 100644
--- 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 0b31a67..0b91685 100644
--- 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 ba67a57..0343c8e 100644
--- 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 92323d1..c3256e9 100644
--- 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 c03a7f1..8c80f90 100644
--- 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 7a3968d..9d354e3 100644
--- 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 507b9fe..02be5c5 100644
--- 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 bed2a0e..1fa063e 100644
--- 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 d918d9f..4837ad9 100644
--- 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 2ebc4a5..852d1e9 100644
--- 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 e3551bc..d53dbd6 100644
--- 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