## Process this file with automake to produce Makefile.in
-# $Id: Makefile.am 993 2004-03-30 21:36:03Z twisti $
+# $Id: Makefile.am 1333 2004-07-21 15:48:46Z twisti $
@SET_MAKE@
MAINTAINERCLEANFILES = Makefile.in configure
-ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
-SUBDIRS = gnuclasspathnat $(ALLSUBDIRS)
+ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst classpath
+SUBDIRS = $(ALLSUBDIRS)
DIST_SUBDIRS = $(ALLSUBDIRS)
EXTRA_DIST = \
nativecalls.h
CLEANFILES = \
- stamp-nat \
- jit/@ARCH_DIR@/offsets.h \
- nativetable.hh \
- nativetypes.hh
+ nativetable.inc
-bin_PROGRAMS = cacao
-noinst_PROGRAMS = cacaoh
+bin_PROGRAMS = cacao cacaoh
+noinst_PROGRAMS = gennativetable genoffsets
-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
asmpart.h \
builtin.c \
builtin.h \
+ exceptions.c \
+ exceptions.h \
global.h \
+ jni.c \
+ jni.h \
loader.c \
loader.h \
main.c \
native.c \
native.h \
- jni.c \
- jni.h \
+ options.c \
+ options.h \
+ statistics.c \
+ statistics.h \
tables.c \
tables.h \
- unzip.c \
typeinfo.c \
- typeinfo.h
+ typeinfo.h \
+ unzip.c
cacao_LDADD = \
jit/libjit.a \
$(BOEHM_LIBS) \
@THREAD_OBJ@ \
toolbox/libtoolbox.a \
- gnuclasspathnat/native/jni/java-io/.libs/libjavaio.a \
- gnuclasspathnat/native/jni/java-nio/.libs/libjavanio.a \
- gnuclasspathnat/native/jni/java-net/.libs/libjavanet.a \
- gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
- gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
- gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
+ classpath/native/jni/java-io/.libs/libjavaio.a \
+ classpath/native/jni/java-nio/.libs/libjavanio.a \
+ classpath/native/jni/java-net/.libs/libjavanet.a \
+ classpath/native/jni/java-util/.libs/libjavautil.a \
+ classpath/native/jni/java-lang/.libs/libjavalang.a \
+ classpath/native/jni/java-lang/.libs/libjavalangreflect.a \
@AWT_OBJS@ \
- @ZIP_LIBS@
+ @ZIP_LIBS@ \
+ @THREAD_LIB@
cacao_DEPENDENCIES = \
$(BOEHM_LIBS) \
@THREAD_OBJ@ \
toolbox/libtoolbox.a \
- gnuclasspathnat/native/jni/java-io/.libs/libjavaio.a \
- gnuclasspathnat/native/jni/java-nio/.libs/libjavanio.a \
- gnuclasspathnat/native/jni/java-net/.libs/libjavanet.a \
- gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
- gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
- gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
+ classpath/native/jni/java-io/.libs/libjavaio.a \
+ classpath/native/jni/java-nio/.libs/libjavanio.a \
+ classpath/native/jni/java-net/.libs/libjavanet.a \
+ classpath/native/jni/java-util/.libs/libjavautil.a \
+ classpath/native/jni/java-lang/.libs/libjavalang.a \
+ classpath/native/jni/java-lang/.libs/libjavalangreflect.a \
+ nativetable.inc \
@AWT_OBJS@ \
@ZIP_LIBS@
cacaoh_SOURCES = \
builtin.c \
+ cacaoh.c \
+ exceptions.c \
headers.c \
loader.c \
+ options.c \
+ statistics.c \
tables.c \
unzip.c
cacaoh_LDADD = \
$(BOEHM_LIBS) \
- gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+ classpath/native/jni/java-lang/.libs/libjavalang.a \
@THREAD_OBJ@ \
@ZIP_LIBS@ \
- toolbox/libtoolbox.a
+ toolbox/libtoolbox.a \
+ @THREAD_LIB@
cacaoh_DEPENDENCIES = \
$(BOEHM_LIBS) \
- gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+ classpath/native/jni/java-lang/.libs/libjavalang.a \
@THREAD_OBJ@ \
@ZIP_LIBS@ \
toolbox/libtoolbox.a
+gennativetable_SOURCES = \
+ builtin.c \
+ exceptions.c \
+ gennativetable.c \
+ headers.c \
+ loader.c \
+ options.c \
+ tables.c \
+ statistics.c \
+ unzip.c
-nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
- test -f stamp-nat || \
- CLASSPATH=./gnuclassfiles ./cacaoh \
+gennativetable_LDADD = \
+ $(BOEHM_LIBS) \
+ classpath/native/jni/java-lang/.libs/libjavalang.a \
+ @THREAD_OBJ@ \
+ @ZIP_LIBS@ \
+ toolbox/libtoolbox.a \
+ @THREAD_LIB@
+
+natheaders: cacaoh
+ CLASSPATH=$(top_srcdir)/classpath/lib/bootstrap.zip ./cacaoh $(CLASSES)
+
+nativetable.inc: gennativetable
+ CLASSPATH=$(top_srcdir)/classpath/lib/bootstrap.zip $(top_srcdir)/gennativetable $(CLASSES) > nativetable.inc
+
+native.c: nativetable.inc
+
+CLASSES= \
java.lang.String \
java.lang.Class \
java.io.FileDescriptor \
+ java.io.VMFile \
gnu.java.nio.SelectorImpl \
gnu.java.nio.FileLockImpl \
gnu.java.lang.reflect.TypeSignature \
java.io.File \
java.lang.SecurityManager \
java.lang.VMSecurityManager \
+ java.lang.reflect.Field \
+ java.lang.reflect.Constructor \
+ java.lang.reflect.Method \
java.io.VMObjectStreamClass \
java.io.ObjectInputStream \
java.io.RandomAccessFile \
java.io.FileWriter \
java.net.NetworkInterface \
java.net.SocketImpl \
- java.net.PlainSocketImpl \
+ gnu.java.net.PlainSocketImpl \
java.net.DatagramSocketImpl \
java.net.InetAddress \
java.net.DatagramPacket \
- java.net.PlainDatagramSocketImpl \
+ gnu.java.net.PlainDatagramSocketImpl \
java.nio.CharBufferImpl \
- java.nio.channels.FileChannelImpl \
java.nio.DoubleBufferImpl \
java.nio.LongBufferImpl \
java.nio.ByteOrder \
java.nio.IntBufferImpl \
java.nio.DirectByteBufferImpl \
java.nio.FloatBufferImpl \
+ gnu.java.nio.channels.FileChannelImpl \
java.sql.Connection \
java.lang.Math \
java.lang.StringBuffer \
javax.swing.Popup \
javax.swing.UIManager \
java.lang.VMClass \
- java.lang.reflect.Field \
- java.lang.reflect.Constructor \
- java.lang.reflect.Method \
java.lang.ThreadGroup \
- java.lang.Thread \
+ java.lang.VMThread \
java.lang.VMDouble \
java.lang.VMFloat \
java.lang.Cloneable \
java.lang.VMString \
java.util.Properties \
java.lang.Runtime \
+ java.lang.VMRuntime \
java.lang.Throwable \
java.lang.VMThrowable \
gnu.java.security.x509.X509Certificate \
java.lang.JOWENNTest1 \
@AWTPEERS@
- touch stamp-nat nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh
-
-native.c: nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh
checkjvm:
$(MAKE) -C jvmtst $@