summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-04-23 22:01:16 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-04-27 17:56:17 -0700
commit023d494822fea9c3840e75964451fd9d5213ae06 (patch)
tree2e9cfb6f5879646e00d156f054ce7dd64c4465c6
parent30506c32f69ea476f3b068ec3bf9b1c2a24991b8 (diff)
Move -I flags from AM_CFLAGS to AM_CPPFLAGS
Ensures local copy of headers takes precedence over any -I flags the builder may have passed in CPPFLAGS. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1091ece..67bf36e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,9 +6,11 @@ libXtst_la_SOURCES = \
libXtst_la_LIBADD = @XTST_LIBS@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/include/X11/extensions \
+ -I$(top_srcdir)/include/X11/extensions
+
+AM_CFLAGS = \
$(XTST_CFLAGS) \
$(CWARNFLAGS)