From d0a844f86bea8b59bf5b34a6c262eb8667d2e641 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Jan 2000 20:00:21 +0000 Subject: [PATCH] Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP. From-SVN: r31672 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bfd61f03c1c..f6883b266bc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-01-28 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP. + 2000-01-26 Tom Tromey * gcj/method.h (JvNumMethods): Moved from Class.h. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index a8765a24478..8b1143babab 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 f6818b36b51..2943f203637 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) \