Fix include paths to support build directories.

diff --git a/Makefile.am b/Makefile.am
index 53910cc1b6d7fcc010ac140cdf13b2f6c9157378..6cd58dc9edc7e038b11d6bff93c23950c2fbfbee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1073 2004-05-19 23:21:15Z stefan $
+# $Id: Makefile.am 1145 2004-06-05 23:57:56Z twisti $
 
 @SET_MAKE@
 
@@ -26,7 +26,7 @@ CLEANFILES = \
 bin_PROGRAMS = cacao
 noinst_PROGRAMS = cacaoh
 
-INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@ -I$(top_srcdir)/jit
+INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@
 
 BOEHM_LIBS = mm/libboehm.a mm/boehm-gc/.libs/libgc.a
 
@@ -109,7 +109,7 @@ cacaoh_DEPENDENCIES = \
 
 nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
        test -f stamp-nat || \
-       CLASSPATH=./gnuclassfiles ./cacaoh \
+       CLASSPATH=$(top_srcdir)/gnuclassfiles ./cacaoh \
        java.lang.String \
        java.lang.Class \
        java.io.FileDescriptor \

diff --git a/jit/Makefile.am b/jit/Makefile.am
index 7834c9ab118f343d076642b8a094669445540777..6b106224f3c2ee385ee395e3b525f484f34f919d 100644 (file)
--- a/jit/Makefile.am
+++ b/jit/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 696 2003-12-06 20:10:05Z edwin $
+# $Id: Makefile.am 1145 2004-06-05 23:57:56Z twisti $
 
 
 SUBDIRS = . loop @ARCH_DIR@
 DIST_SUBDIRS = loop alpha i386 mips powerpc x86_64
 
-INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@ -I$(top_srcdir)/jit
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit/@ARCH_DIR@
 
 EXTRA_DIST = \
        jit.c \

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 7834c9ab118f343d076642b8a094669445540777..6b106224f3c2ee385ee395e3b525f484f34f919d 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 696 2003-12-06 20:10:05Z edwin $
+# $Id: Makefile.am 1145 2004-06-05 23:57:56Z twisti $
 
 
 SUBDIRS = . loop @ARCH_DIR@
 DIST_SUBDIRS = loop alpha i386 mips powerpc x86_64
 
-INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@ -I$(top_srcdir)/jit
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit/@ARCH_DIR@
 
 EXTRA_DIST = \
        jit.c \