Mercurial > hg > octave-lyh

changeset 10061:ec0c445d0d6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include -I../libgnu in AM_CPPFLAGS
author John W. Eaton <jwe@octave.org>
date Tue, 05 Jan 2010 02:02:28 -0500
parents 8f51a90eb8d1
children 7494d047e98d
files libcruft/ChangeLog libcruft/Makefile.am liboctave/ChangeLog liboctave/Makefile.am src/ChangeLog src/Makefile.am
diffstat 6 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (AM_CPPFLAGS): New variable.
+
 2009-12-31  Rik <octave@nomad.inbox5.com>
 
 	* Makefile.am: Reverse using simple_move_if_change_rule for cruft.def
--- a/libcruft/Makefile.am
+++ b/libcruft/Makefile.am
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/common.mk
 
+AM_CPPFLAGS = @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu
+
 AUTOMAKE_OPTIONS = subdir-objects
 
 octlib_LTLIBRARIES = libcruft.la
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-05  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (AM_CPPFLAGS): Include @CPPFLAGS@ and -I../libgnu
+	in the list.
+
 2009-12-30  Jaroslav Hajek  <highegg@gmail.com>
 
 	* idx-vector.cc (idx_vector::maybe_reduce): Implement reduction rule
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -21,7 +21,9 @@
 
 include $(top_srcdir)/common.mk
 
-AM_CPPFLAGS = -I$(top_srcdir)/libgnu -I$(top_srcdir)/libcruft/misc
+AM_CPPFLAGS = \
+  @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
+  -I$(top_srcdir)/libcruft/misc
 
 EXTRA_DIST = \
   ChangeLog \
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (AM_CPPFLAGS): Include -I../libgnu in the list.
+
 2010-01-04  Thorsten Meyer  <thorsten.meyier@gmx.de>
 
 	* graphics.cc (graphics_object::set (const Octave_map&)): New function.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,10 @@
   liboctinterp.la
 
 AM_CPPFLAGS = \
-  @CPPFLAGS@ -I$(top_srcdir)/libgnu -I$(top_srcdir)/libcruft/misc -I../liboctave -I$(top_srcdir)/liboctave -I. -I$(srcdir) 
+  @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
+  -I$(top_srcdir)/libcruft/misc \
+  -I../liboctave -I$(top_srcdir)/liboctave \
+  -I. -I$(srcdir) 
 
 AUTOMAKE_OPTIONS = subdir-objects