summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-11-25 11:14:15 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-11-25 11:14:29 +0000
commit42f325a87c336211ebb3ebcafc9130eff10cee93 (patch)
tree411b64cb392f6d17ef0486a5b30134080d5e5248 /src
parent4c4458e8a30920d065ca5db5d3ca3cc49454b869 (diff)
sna: Keep @NOWARNFLAGS@ last
As the last option overrides the earlier options, make sure these particular overrides always take effect by adding them last. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/Makefile.am3
-rw-r--r--src/sna/brw/Makefile.am3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index 604ae251..3377b9cc 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS = brw fb
AM_CFLAGS = \
@CWARNFLAGS@ \
- @NOWARNFLAGS@ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/render_program \
$(XORG_CFLAGS) \
@@ -135,3 +134,5 @@ git_version.h: $(top_srcdir)/.git/HEAD $(shell sed -e '/ref:/!d' -e 's#ref: *#$(
@V=`git describe`; echo "static const char git_version[] = \"$$V\";" > git_version.h
sna_driver.c: git_version.h
endif
+
+AM_CFLAGS += @NOWARNFLAGS@
diff --git a/src/sna/brw/Makefile.am b/src/sna/brw/Makefile.am
index 61deb715..38056468 100644
--- a/src/sna/brw/Makefile.am
+++ b/src/sna/brw/Makefile.am
@@ -29,7 +29,6 @@ AM_CFLAGS = \
@XORG_CFLAGS@ \
@UDEV_CFLAGS@ \
@DRM_CFLAGS@ \
- @NOWARNFLAGS@ \
$(NULL)
if DEBUG
@@ -58,3 +57,5 @@ brw_test_SOURCES = \
brw_test_LDADD = \
libbrw.la \
$(NULL)
+
+AM_CFLAGS += @NOWARNFLAGS@