Mercurial > hg > octave-lyh

changeset 14397:670feb71afde stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Move @CPPFLAGS@ to end of AM_CPPFLAGS lists in Makefiles. * libcruft/Makefile.am (AM_CPPFLAGS): Move @CPPFLAGS@ to the end of the list. * liboctave/Makefile.am: Likewise. * src/Makefile.am: Likewise.
author John W. Eaton <jwe@octave.org>
date Thu, 23 Feb 2012 15:45:16 -0500
parents 08e48e7a4c8a
children e8bc9c02533a 731e9e1539a8
files libcruft/Makefile.am liboctave/Makefile.am src/Makefile.am
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/Makefile.am
+++ b/libcruft/Makefile.am
@@ -20,7 +20,10 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
-AM_CPPFLAGS = @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu
+## Search local directories before those specified by the user.
+AM_CPPFLAGS = \
+  -I../libgnu -I$(top_srcdir)/libgnu \
+  @CPPFLAGS@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -20,9 +20,11 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
+## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
-  -I$(top_srcdir)/libcruft/misc
+  -I../libgnu -I$(top_srcdir)/libgnu \
+  -I$(top_srcdir)/libcruft/misc \
+  @CPPFLAGS@
 
 EXTRA_DIST = \
   config-ops.sh \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,11 +20,13 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
+## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
+  -I../libgnu -I$(top_srcdir)/libgnu \
   -I$(top_srcdir)/libcruft/misc \
   -I../liboctave -I$(top_srcdir)/liboctave \
-  -I. -I$(srcdir)
+  -I. -I$(srcdir) \
+  @CPPFLAGS@
 
 AUTOMAKE_OPTIONS = subdir-objects