# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1262674948 18000
# Node ID ec0c445d0d6f1f21021b97717f181a021f9ec98b
# Parent  8f51a90eb8d1eb31b670a606d4437b0447972ff4
include -I../libgnu in AM_CPPFLAGS

diff -r 8f51a90eb8d1 -r ec0c445d0d6f libcruft/ChangeLog
--- a/libcruft/ChangeLog	Tue Jan 05 07:28:42 2010 +0100
+++ b/libcruft/ChangeLog	Tue Jan 05 02:02:28 2010 -0500
@@ -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
diff -r 8f51a90eb8d1 -r ec0c445d0d6f libcruft/Makefile.am
--- a/libcruft/Makefile.am	Tue Jan 05 07:28:42 2010 +0100
+++ b/libcruft/Makefile.am	Tue Jan 05 02:02:28 2010 -0500
@@ -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
diff -r 8f51a90eb8d1 -r ec0c445d0d6f liboctave/ChangeLog
--- a/liboctave/ChangeLog	Tue Jan 05 07:28:42 2010 +0100
+++ b/liboctave/ChangeLog	Tue Jan 05 02:02:28 2010 -0500
@@ -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
diff -r 8f51a90eb8d1 -r ec0c445d0d6f liboctave/Makefile.am
--- a/liboctave/Makefile.am	Tue Jan 05 07:28:42 2010 +0100
+++ b/liboctave/Makefile.am	Tue Jan 05 02:02:28 2010 -0500
@@ -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 \
diff -r 8f51a90eb8d1 -r ec0c445d0d6f src/ChangeLog
--- a/src/ChangeLog	Tue Jan 05 07:28:42 2010 +0100
+++ b/src/ChangeLog	Tue Jan 05 02:02:28 2010 -0500
@@ -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.
diff -r 8f51a90eb8d1 -r ec0c445d0d6f src/Makefile.am
--- a/src/Makefile.am	Tue Jan 05 07:28:42 2010 +0100
+++ b/src/Makefile.am	Tue Jan 05 02:02:28 2010 -0500
@@ -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