[yelp/wip/kill-gnome-common: 17/18] Use WARN_CFLAGS instead of AM_CFLAGS

[David King <davidk src gnome org>]

commit 2411f55933b245e8a1fab0a2507eb82942743e2e
Author: David King <amigadave amigadave com>
Date:   Thu Jan 29 14:32:56 2015 +0000

    Use WARN_CFLAGS instead of AM_CFLAGS
    
    There is no need to use the indirection of AM_CFLAGS.

 configure.ac      |    1 -
 src/Makefile.am   |    2 +-
 tests/Makefile.am |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5147314..402d065 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,6 @@ AC_SUBST(GLIB_GENMARSHAL)
 
 # Set flags
 AM_CPPFLAGS="$AM_CPPFLAGS"
-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 
 
 AC_SUBST([AM_CPPFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2ce1993..5bf6f39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ YELP_DEFINES =                                                                \
 yelp_CFLAGS =                                  \
        -I$(top_srcdir)/libyelp                 \
        $(YELP_CFLAGS)                          \
-       $(AM_CFLAGS)                            \
+       $(WARN_CFLAGS)                          \
        $(YELP_DEFINES)
 
 yelp_LDADD =                                   \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8398f9e..01f2c6d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 YELP_COMMON_CFLAGS =                           \
        $(YELP_CFLAGS)                          \
-       $(AM_CFLAGS)                            \
+       $(WARN_CFLAGS)                          \
        $(YELP_DEFINES)                         \
        -DDATADIR=\""$(datadir)"\"              \
        -I$(top_srcdir)/libyelp