[epiphany] Don't set AM_CFLAGS in configure.ac

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 0c656af35302624040f07688a6adb79bb8512eea
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Dec 7 20:11:39 2014 +0100

    Don't set AM_CFLAGS in configure.ac
    
    This makes it impossible to use AM_CFLAGS, a useful variable, without
    manually overwriting the value given in configure.ac. Instead, just
    add WARN_CFLAGS to AM_CFLAGS everywhere.
    
    Also, stop setting several other variables with empty values.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741223

 configure.ac                    |    4 +---
 embed/Makefile.am               |    2 ++
 embed/web-extension/Makefile.am |    2 ++
 lib/widgets/Makefile.am         |    2 ++
 src/Makefile.am                 |    2 ++
 src/bookmarks/Makefile.am       |    2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f863d14..e409c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ GNOME_MAINTAINER_MODE_DEFINES
 
 GNOME_CODE_COVERAGE
 
-MORE_WARN_FLAGS="-Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes"
+WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes"
 
 GLIB_REQUIRED=2.38.0
 GTK_REQUIRED=3.13.0
@@ -161,9 +161,7 @@ AM_CONDITIONAL([ENABLE_NSS],[test "$enable_nss" = "yes"])
 # Add warning flags
 # *******************************
 
-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS"
 AC_SUBST([AM_CPPFLAGS])
-AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
 # *******************************
diff --git a/embed/Makefile.am b/embed/Makefile.am
index d1a2220..6a9529b 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -2,6 +2,8 @@ NULL =
 
 SUBDIRS = web-extension
 
+AM_CFLAGS = $(WARN_CFLAGS)
+
 noinst_LTLIBRARIES = libephyembed.la
 
 NOINST_H_FILES = \
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 86b48b7..2d1461b 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -1,3 +1,5 @@
+AM_CFLAGS = $(WARN_CFLAGS)
+
 webextension_LTLIBRARIES = libephywebextension.la
 
 webextensiondir = \
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index e37b4f2..8673688 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libephywidgets.la
 
+AM_CFLAGS = $(WARN_CFLAGS)
+
 BUILT_SOURCES = \
        ephy-widgets-type-builtins.c    \
        ephy-widgets-type-builtins.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e48363..69f8185 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = bookmarks
 
 NULL =
 
+AM_CFLAGS = $(WARN_CFLAGS)
+
 noinst_LTLIBRARIES = libephymain.la
 
 bin_PROGRAMS = epiphany
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 49cf369..f11f43f 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libephybookmarks.la
 
+AM_CFLAGS = $(WARN_CFLAGS)
+
 INST_H_FILES = \
        ephy-bookmarks.h