Mercurial > octave-nkf

changeset 15120:9db33c1f6f5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Rik <rik@octave.org>
date Mon, 06 Aug 2012 17:27:18 -0700
parents 718bed882d3e
children 04c881e66740
files libcruft/Makefile.am liboctave/Makefile.am src/Makefile.am
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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 \
--- 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