From 42f325a87c336211ebb3ebcafc9130eff10cee93 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 25 Nov 2013 11:14:15 +0000 Subject: [PATCH] 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 --- src/sna/Makefile.am | 3 ++- src/sna/brw/Makefile.am | 3 ++- 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@