X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=bf7c8e33754b41aca4800c2024e9a6847fa25af6;hb=31f21488d35e775095190f8698b93a21bac1fc13;hp=dedec02a5f31fd7159cbf1a29f5d18c8a22e4f78;hpb=ed694e4a5adbbd92d420682b68a32c2d03754fd8;p=cacao.git diff --git a/Makefile.am b/Makefile.am index dedec02a5..bf7c8e337 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,12 @@ ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 898 2004-01-21 19:36:48Z 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 = \ @@ -18,14 +18,12 @@ EXTRA_DIST = \ nativecalls.h CLEANFILES = \ - 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 @@ -33,19 +31,25 @@ cacao_SOURCES = \ 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 \ @@ -55,14 +59,15 @@ cacao_LDADD = \ $(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 = \ @@ -73,43 +78,74 @@ 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 + +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) -nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile - test -f stamp-nat || \ - CLASSPATH=./gnuclassfiles ./cacaoh \ +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 \ @@ -122,6 +158,9 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef 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 \ @@ -132,13 +171,12 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef 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 \ @@ -146,6 +184,7 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef java.nio.IntBufferImpl \ java.nio.DirectByteBufferImpl \ java.nio.FloatBufferImpl \ + gnu.java.nio.channels.FileChannelImpl \ java.sql.Connection \ java.lang.Math \ java.lang.StringBuffer \ @@ -176,17 +215,15 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef java.util.Locale \ java.util.Hashtable \ java.beans.PropertyEditor \ + java.security.AccessController \ + java.security.ProtectionDomain \ java.security.cert.Certificate \ java.security.cert.X509Certificate \ - java.security.AccessController \ 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 \ @@ -194,22 +231,19 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef java.lang.VMClassLoader \ java.io.PrintStream \ java.lang.VMSystem \ + 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 $@ -clean: - rm -f stamp-nat - ## Local variables: ## mode: Makefile