aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>2000-01-28 20:00:21 +0000
committerTom Tromey <tromey@gcc.gnu.org>2000-01-28 20:00:21 +0000
commitd0a844f86bea8b59bf5b34a6c262eb8667d2e641 (patch)
tree8f92a3ebc7d807c6e65c2c152510bf101d9ff5ae
parent74dc0d8cabeefe571958ad34a76e1185b4f678e0 (diff)
downloadgcc-d0a844f86bea8b59bf5b34a6c262eb8667d2e641.zip
gcc-d0a844f86bea8b59bf5b34a6c262eb8667d2e641.tar.gz
gcc-d0a844f86bea8b59bf5b34a6c262eb8667d2e641.tar.bz2
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt. * Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP. From-SVN: r31672
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bfd61f0..f6883b2 100644
--- 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 a8765a2..8b1143b 100644
--- 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 f6818b3..2943f20 100644
--- 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) \