From bb519beccf395b83f9a2976d1836f2c0033aac14 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 18 Nov 2008 01:01:54 +0100
Subject: Fix WARN_CFLAGS uses.

---
 doc/examples/Makefile.am | 3 +--
 lib/Makefile.am          | 2 +-
 lib/openpgp/Makefile.am  | 2 +-
 libextra/Makefile.am     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 3ba158f8d3..004af4020f 100644
--- 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 0c75c175ce..4be39b632c 100644
--- 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 501472e8f4..27f57e123f 100644
--- 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 ce01bd9830..5a5c698bbc 100644
--- 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			\
-- 
cgit v1.2.1