a few finalizer testcases, old thread implementation uses now VMThread, no mor contex...

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f482cde803da310cdf3681e1fcdf38251513e35d..e4d86bf1948a6b6e0e32975b0704dab1bf3b470e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 885 2004-01-16 07:25:13Z jowenn $
+# $Id: Makefile.am 1173 2004-06-16 14:56:18Z jowenn $
 
 @SET_MAKE@
 
@@ -18,6 +18,7 @@ EXTRA_DIST = \
        nativecalls.h
 
 CLEANFILES = \
+       stamp-nat \
        jit/@ARCH_DIR@/offsets.h \
        nativetable.hh \
        nativetypes.hh
@@ -25,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
 
@@ -51,10 +52,10 @@ cacao_LDADD = \
        jit/libjit.a \
        jit/loop/libloop.a \
        jit/@ARCH_DIR@/libarch.a \
-       toolbox/libtoolbox.a \
        nat/libnat.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 \
@@ -62,17 +63,18 @@ cacao_LDADD = \
        gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
        gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
        @AWT_OBJS@ \
-       @ZIP_LIBS@
+       @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@ \
+       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 \
@@ -83,29 +85,35 @@ cacao_DEPENDENCIES = \
        @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@  @ZIP_LIBS@
+       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=./gnuclassfiles ./cacaoh \
+       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 \
@@ -128,13 +136,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 \
@@ -142,6 +149,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 \
@@ -172,9 +180,10 @@ 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 \
@@ -182,7 +191,7 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef
        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 \
@@ -190,9 +199,12 @@ 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@
@@ -203,9 +215,6 @@ native.c: nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh
 checkjvm:
        $(MAKE) -C jvmtst $@
 
-clean:
-       rm -f stamp-nat
-
 
 ## Local variables:
 ## mode: Makefile