a few finalizer testcases, old thread implementation uses now VMThread, no mor contex...
[cacao.git] / Makefile.am
index 0d2e1eefd4a71c7e9fc4e601f0bfdb9bff4670c9..e4d86bf1948a6b6e0e32975b0704dab1bf3b470e 100644 (file)
@@ -1,24 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 557 2003-11-02 22:51:59Z twisti $
+# $Id: Makefile.am 1173 2004-06-16 14:56:18Z jowenn $
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
 ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
-SUBDIRS = $(ALLSUBDIRS)
+SUBDIRS = gnuclasspathnat $(ALLSUBDIRS)
 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \
        html/cacaoinstall.html \
        html/cacaoman.html \
        html/index.html \
-       jni.c \
+       main.h \
        natcalls.h \
        nativecalls.h
 
 CLEANFILES = \
-       jit/@ARCH_DIR@/asmpart.o \
+       stamp-nat \
        jit/@ARCH_DIR@/offsets.h \
        nativetable.hh \
        nativetypes.hh
@@ -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
 
@@ -40,104 +40,178 @@ cacao_SOURCES = \
        main.c \
        native.c \
        native.h \
+       jni.c \
        jni.h \
        tables.c \
-       tables.h
+       tables.h \
+       unzip.c \
+       typeinfo.c \
+       typeinfo.h
 
 cacao_LDADD = \
        jit/libjit.a \
        jit/loop/libloop.a \
        jit/@ARCH_DIR@/libarch.a \
-       toolbox/libtoolbox.a \
+       nat/libnat.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@
+       @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 \
+       @AWT_OBJS@ \
+       @ZIP_LIBS@ \
+       @THREAD_LIB@
+
 
 cacao_DEPENDENCIES = \
        jit/libjit.a \
        jit/loop/libloop.a \
        jit/@ARCH_DIR@/libarch.a \
-       toolbox/libtoolbox.a \
+       nat/libnat.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@
+       @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 \
+       @AWT_OBJS@ \
+       @ZIP_LIBS@
 
 cacaoh_SOURCES = \
+       builtin.c \
        headers.c \
-       tables.c \
        loader.c \
-       builtin.c
+       tables.c \
+       unzip.c
 
 cacaoh_LDADD = \
-       toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       @THREAD_OBJ@ \
+       @ZIP_LIBS@ \
+       toolbox/libtoolbox.a \
+       @THREAD_LIB@
 
 cacaoh_DEPENDENCIES = \
-       toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       @THREAD_OBJ@ \
+       @ZIP_LIBS@ \
+       toolbox/libtoolbox.a
+
+
+nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
+       test -f stamp-nat || \
+       CLASSPATH=$(top_srcdir)/gnuclassfiles ./cacaoh \
+       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 \
+       gnu.java.math.MPN \
+       gnu.classpath.RawData \
+       gnu.classpath.Configuration \
+       java.io.OutputStream \
+       java.io.PrintWriter \
+       java.io.FileInputStream \
+       java.io.File \
+       java.lang.SecurityManager \
+       java.lang.VMSecurityManager \
+       java.io.VMObjectStreamClass \
+       java.io.ObjectInputStream \
+       java.io.RandomAccessFile \
+       java.io.Writer \
+       java.io.DataInput \
+       java.io.DataInputStream \
+       java.io.OutputStreamWriter \
+       java.io.FileWriter \
+       java.net.NetworkInterface \
+       java.net.SocketImpl \
+       gnu.java.net.PlainSocketImpl \
+       java.net.DatagramSocketImpl \
+       java.net.InetAddress \
+       java.net.DatagramPacket \
+       gnu.java.net.PlainDatagramSocketImpl \
+       java.nio.CharBufferImpl \
+       java.nio.DoubleBufferImpl \
+       java.nio.LongBufferImpl \
+       java.nio.ByteOrder \
+       java.nio.ShortBufferImpl \
+       java.nio.IntBufferImpl \
+       java.nio.DirectByteBufferImpl \
+       java.nio.FloatBufferImpl \
+       gnu.java.nio.channels.FileChannelImpl \
+       java.sql.Connection \
+       java.lang.Math \
+       java.lang.StringBuffer \
+       java.lang.reflect.Array \
+       java.lang.reflect.Modifier \
+       java.lang.reflect.Proxy \
+       java.lang.Double \
+       java.lang.Compiler \
+       java.lang.Byte \
+       java.lang.Character \
+       java.lang.Integer \
+       java.lang.Long \
+       java.lang.Short \
+       java.lang.Boolean \
+       java.lang.StackTraceElement \
+       java.lang.Float \
+       java.lang.Object \
+       java.lang.RuntimePermission \
+       java.lang.System \
+       java.lang.StrictMath \
+       java.lang.ClassLoader \
+       java.lang.Process \
+       java.lang.UnsatisfiedLinkError \
+       java.text.Collator \
+       java.util.zip.Deflater \
+       java.util.zip.Inflater \
+       java.util.TimeZone \
+       java.util.Locale \
+       java.util.Hashtable \
+       java.beans.PropertyEditor \
+       java.security.AccessController \
+       java.security.ProtectionDomain \
+       java.security.cert.Certificate \
+       java.security.cert.X509Certificate \
+       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.VMThread \
+       java.lang.VMDouble \
+       java.lang.VMFloat \
+       java.lang.Cloneable \
+       java.lang.VMObject \
+       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
 
-nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh
-       ./cacaoh \
-               java.lang.Object \
-               java.lang.String \
-               java.lang.ClassLoader \
-               java.lang.Class \
-               java.lang.Compiler \
-               java.lang.Integer \
-               java.lang.Double \
-               java.lang.Float \
-               java.lang.Math \
-               java.lang.Package \
-               java.lang.Runtime \
-               java.lang.SecurityManager \
-               java.lang.Exception \
-               java.io.PrintStream \
-               java.io.InputStream \
-               java.lang.System \
-               java.lang.Thread \
-               java.lang.ThreadGroup \
-               java.lang.Throwable \
-               java.lang.reflect.Array \
-               java.lang.reflect.Constructor \
-               java.lang.reflect.Field \
-               java.lang.reflect.Method \
-               java.lang.reflect.Modifier \
-               java.io.FileDescriptor \
-               java.io.FileInputStream \
-               java.io.FileOutputStream \
-               java.io.FileSystem \
-               java.io.ObjectInputStream \
-               java.io.ObjectStreamClass \
-               java.io.RandomAccessFile \
-               java.util.ResourceBundle \
-               java.util.jar.JarFile \
-               java.util.zip.Adler32 \
-               java.util.zip.CRC32 \
-               java.util.zip.Deflater \
-               java.util.zip.Inflater \
-               java.util.zip.ZipEntry \
-               java.util.zip.ZipFile \
-               java.util.Properties \
-               java.util.Date \
-               java.math.BigInteger \
-               java.net.InetAddress \
-               java.net.InetAddressImpl \
-               java.net.DatagramPacket \
-               java.net.PlainDatagramSocketImpl \
-               java.net.SocketImpl \
-               java.net.PlainSocketImpl \
-               java.net.SocketInputStream \
-               java.net.SocketOutputStream \
-               java.security.PrivilegedActionException \
-               java.security.PrivilegedAction \
-               java.security.PrivilegedExceptionAction \
-               java.security.AccessController \
-               java.io.File \
-               java.io.UnixFileSystem \
-               java.lang.ClassLoader_NativeLibrary
-
 checkjvm:
        $(MAKE) -C jvmtst $@