rendercheck: configure.ac Makefile.am

Gaetan Nadon gnadon at kemper.freedesktop.org
Sat Feb 13 07:35:29 PST 2010


 Makefile.am  |    2 +-
 configure.ac |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 83a772482d3bf85eeb3f47a7456a662b3b91c1d2
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Feb 11 10:08:06 2010 -0500

    config: move CWARNFLAGS from configure.ac to Makefile.am
    
    Compiler warning flags should be explicitly set in the makefile
    rather than being merged with other packages compiler flags.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index 9c95700..3136e20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ rendercheck_SOURCES = \
 	t_tsrccoords2.c \
 	t_triangles.c
 
-INCLUDES = $(RC_CFLAGS)
+AM_CFLAGS = $(RC_CFLAGS) $(CWARNFLAGS)
 rendercheck_LDADD = $(RC_LIBS)
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index d1a4ce2..55927d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,9 +47,8 @@ then
 fi
 
 if test "x$GCC" = "xyes" -a "x$WERROR" = "xyes"; then
-	CWARNFLAGS="$CWARNFLAGS -Werror"
+	RC_CFLAGS="$RC_CFLAGS -Werror"
 fi
-RC_CFLAGS="$CWARNFLAGS $RC_CFLAGS"
 AC_SUBST(RC_CFLAGS)
 AC_SUBST(RC_LIBS)
 


More information about the xorg-commit mailing list