summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-07-03 15:49:21 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-07-24 12:12:04 +1000
commitf4fe56973a29265e22f049ceed1e299573f90ec4 (patch)
tree6547fcc371b14b1fbc5499fc1afc8a98faa1e77b
parente79f2b211830dec2bae35595c6dfd1d06f75d903 (diff)
Rename INCLUDES to AM_CPPFLAGS
src/Makefile.am:22: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--test/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index c175641..50f8ffe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = src test
3pkgconfigdir = $(libdir)/pkgconfig 3pkgconfigdir = $(libdir)/pkgconfig
4pkgconfig_DATA = mtdev.pc 4pkgconfig_DATA = mtdev.pc
5 5
6INCLUDES = $(top_srcdir)/include/ 6AM_CPPFLAGS = $(top_srcdir)/include/
7 7
8.PHONY: ChangeLog INSTALL 8.PHONY: ChangeLog INSTALL
9INSTALL: 9INSTALL:
diff --git a/src/Makefile.am b/src/Makefile.am
index 16d388c..317e237 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ libmtdev_la_SOURCES = \
18 18
19AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI 19AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI
20 20
21INCLUDES = -I$(top_srcdir)/include/ 21AM_CPPFLAGS = -I$(top_srcdir)/include/
22 22
23libmtdevincludedir = $(includedir) 23libmtdevincludedir = $(includedir)
24libmtdevinclude_HEADERS = \ 24libmtdevinclude_HEADERS = \
diff --git a/test/Makefile.am b/test/Makefile.am
index 0cdd859..2b504bd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
1noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel 1noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel
2bin_PROGRAMS = mtdev-test 2bin_PROGRAMS = mtdev-test
3 3
4INCLUDES=-I$(top_srcdir)/include/ 4AM_CPPFLAGS=-I$(top_srcdir)/include/
5 5
6mtdev_mapgen_SOURCES = mtdev-mapgen.c 6mtdev_mapgen_SOURCES = mtdev-mapgen.c
7 7