Fix WARN_CFLAGS uses.

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 3ba158f8d30d0e43125a0e9a11aeb8623e53d1d3..004af4020fca16ddb2a9800f373e1c55aab10636 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -19,8 +19,8 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = \
-       $(WARN_CFLAGS)                          \
        -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes     \
        -I$(top_srcdir)/libextra/includes                               \
        -I$(top_srcdir)/gl -I$(top_builddir)/gl
@@ -43,7 +43,6 @@ endif
 
 if ENABLE_CXX
 ex_cxx_SOURCES = ex-cxx.cpp
-ex_cxx_CPPFLAGS = -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes
 ex_cxx_LDADD = $(CXX_LDADD)
 noinst_PROGRAMS += ex-cxx
 endif

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0c75c175ced87a60da93ad4309cef1c0d46e9dd6..4be39b632c243c442e26b8a6e4ea0ec402fb9bdb 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,8 +29,8 @@ endif
 
 localedir = $(datadir)/locale
 
+AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = \
-       $(WARN_CFLAGS)                          \
        -DLOCALEDIR=\"$(localedir)\"            \
        -I$(srcdir)/gl                          \
        -I$(builddir)/gl                        \

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 501472e8f47ec20b16da9476637f5a0447e84325..27f57e123f34be95b988d9f4db41294ab18d389d 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -20,8 +20,8 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
 
+AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = \
-       $(WARN_CFLAGS)                  \
        -I$(srcdir)/../gl               \
        -I$(builddir)/../gl             \
        -I$(srcdir)/../includes         \

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index ce01bd983083139219c4ef1b9681f056da1db17a..5a5c698bbcbf4cff336500bd9256927dbfb43a2a 100644 (file)
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -22,8 +22,8 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I ../lib/m4
 
+AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = \
-       $(WARN_CFLAGS)                  \
        -I$(srcdir)/../lib/gl           \
        -I$(builddir)/../lib/gl         \
        -I$(srcdir)/gl                  \