Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP.

From-SVN: r31672

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bfd61f03c1cca8cbb36a91c8bc8496c42063bf58..f6883b266bca61524b776d9435b20c960e99863b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-28  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP.
+
 2000-01-26  Tom Tromey  <tromey@cygnus.com>
 
        * gcj/method.h (JvNumMethods): Moved from Class.h.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index a8765a2447885e6b184a65c8cb1433d86f7e2e4b..8b1143babab357b082f53007b68985626f7ae88f 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -87,7 +87,7 @@ endif
 JCFLAGS = -g -L$(here)
 JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@
 
-LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
+LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
 
 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) $(INCLTDL) \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f6818b36b51bb3feb7e13aa2641ed9200831eea1..2943f203637960fdf7eac38276fed8f0034685ce 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -170,7 +170,7 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ \
 JCFLAGS = -g -L$(here)
 JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@
 
-LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
+LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
 
 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) $(INCLTDL) \