# HG changeset patch
# User Rik <rik@octave.org>
# Date 1344299238 25200
# Node ID 9db33c1f6f5f785edd531af1813260cd02815d6c
# Parent  718bed882d3ecdea4007e1d53fe22ebf916d1748
Remove CPPFLAGS from AM_CPPFLAGS which causes CPPFLAGS to appear twice during compile.

* libcruft/Makefile.am, liboctave/Makefile.am, src/Makefile.am:
Remove instantiation of CPPFLAGS in AM_CPPFLAGS.

diff -r 718bed882d3e -r 9db33c1f6f5f libcruft/Makefile.am
--- a/libcruft/Makefile.am	Mon Aug 06 09:41:20 2012 -0700
+++ b/libcruft/Makefile.am	Mon Aug 06 17:27:18 2012 -0700
@@ -22,8 +22,7 @@
 
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  -I../libgnu -I$(top_srcdir)/libgnu \
-  @CPPFLAGS@
+  -I../libgnu -I$(top_srcdir)/libgnu
 
 AUTOMAKE_OPTIONS = subdir-objects
 
diff -r 718bed882d3e -r 9db33c1f6f5f liboctave/Makefile.am
--- a/liboctave/Makefile.am	Mon Aug 06 09:41:20 2012 -0700
+++ b/liboctave/Makefile.am	Mon Aug 06 17:27:18 2012 -0700
@@ -23,8 +23,7 @@
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
   -I../libgnu -I$(top_srcdir)/libgnu \
-  -I$(top_srcdir)/libcruft/misc \
-  @CPPFLAGS@
+  -I$(top_srcdir)/libcruft/misc
 
 EXTRA_DIST = \
   config-ops.sh \
diff -r 718bed882d3e -r 9db33c1f6f5f src/Makefile.am
--- a/src/Makefile.am	Mon Aug 06 09:41:20 2012 -0700
+++ b/src/Makefile.am	Mon Aug 06 17:27:18 2012 -0700
@@ -31,8 +31,7 @@
   -Iinterpfcn -I$(srcdir)/interpfcn \
   -Icorefcn \
   -I. -I$(srcdir) \
-  -I../libgnu -I$(top_srcdir)/libgnu \
-  @CPPFLAGS@
+  -I../libgnu -I$(top_srcdir)/libgnu
 
 AUTOMAKE_OPTIONS = subdir-objects