First try to get a bootstrap-like build process.

diff --git a/Makefile.am b/Makefile.am
index 3cda951f05beff52fc3a5ba9d28e56941ad461b1..a82e89718c6151f5544fabcb8256080dca88ca8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1529 2004-11-17 17:19:14Z twisti $
+# $Id: Makefile.am 1541 2004-11-18 12:17:56Z twisti $
 
 @SET_MAKE@
 
@@ -28,27 +28,16 @@ INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@
 BOEHM_LIBS = mm/libboehm.a mm/boehm-gc/.libs/libgc.a
 
 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 \
        options.c \
-       options.h \
        statistics.c \
-       statistics.h \
        tables.c \
-       tables.h \
        typeinfo.c \
-       typeinfo.h \
        unzip.c
 
 cacao_LDADD = \
@@ -59,7 +48,6 @@ cacao_LDADD = \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
        toolbox/libtoolbox.a \
-        classpath/native/fdlibm/.libs/libfdlibm.a \
         @STATIC_CLASSPATH_LIBS@ \
         @DYNAMIC_CLASSPATH_LIBS@ \
        @AWT_OBJS@ \
@@ -123,6 +111,34 @@ gennativetable_LDADD = \
        toolbox/libtoolbox.a \
        @THREAD_LIB@
 
+gennativetable_DEPENDENCIES = \
+       $(BOEHM_LIBS) \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \
+       @THREAD_OBJ@ \
+       @ZIP_LIBS@ \
+       toolbox/libtoolbox.a \
+       @THREAD_LIB@
+
+all: cacaoh natheaders genoffsets gennativetable cacao
+
+mm/libboehm.a:
+       make -C mm
+
+classpath/native/jni/java-lang/.libs/libjavalang.a:
+       make -C classpath/native/
+
+threads/libthreads.a:
+       make -C threads
+
+toolbox/libtoolbox.a:
+       make -C toolbox
+
+jit/libjit.a:
+       make -C jit
+
+nat/libnat.a:
+       make -C nat
+
 natheaders: cacaoh
        CLASSPATH=$(top_srcdir)/classpath/lib/bootstrap.zip \
        ./cacaoh -d nat/ \
@@ -134,108 +150,115 @@ nativetable.inc: gennativetable nat/implementednatives.data
        $(CLASSES) \
        > nativetable.inc
 
+nat/implementednatives.data:
+       make -C nat implementednatives
+
 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 \
+       java.lang.Cloneable \
+       java.lang.reflect.Field \
+       java.lang.SecurityManager \
+       java.net.DatagramPacket \
+       java.net.InetAddress \
+       java.net.SocketImpl \
+       java.util.Properties \
+       \
+       gnu.classpath.Configuration \
+       gnu.classpath.RawData \
        gnu.java.lang.reflect.TypeSignature \
        gnu.java.math.MPN \
-       gnu.classpath.RawData \
-       gnu.classpath.Configuration \
-       java.io.OutputStream \
-       java.io.PrintWriter \
-       java.io.FileInputStream \
+       gnu.java.net.PlainDatagramSocketImpl \
+       gnu.java.net.PlainSocketImpl \
+       gnu.java.nio.FileLockImpl \
+       gnu.java.nio.SelectorImpl \
+       gnu.java.nio.channels.FileChannelImpl \
+       gnu.java.security.x509.X509Certificate  \
+       java.beans.PropertyEditor \
+       java.io.DataInput \
+       java.io.DataInputStream \
        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.FileDescriptor \
+       java.io.FileInputStream \
+       java.io.FileWriter \
        java.io.ObjectInputStream \
+       java.io.OutputStream \
+       java.io.OutputStreamWriter \
+       java.io.PrintStream \
+       java.io.PrintWriter \
        java.io.RandomAccessFile \
+       java.io.VMFile \
+       java.io.VMObjectStreamClass \
        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.Boolean \
        java.lang.Byte \
        java.lang.Character \
+       java.lang.Class \
+       java.lang.Compiler \
+       java.lang.Double \
+       java.lang.Float \
        java.lang.Integer \
+       java.lang.JOWENNTest1 \
        java.lang.Long \
+       java.lang.Math \
+       java.lang.Process \
+       java.lang.Runtime \
+       java.lang.RuntimePermission \
        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.StringBuffer \
+       java.lang.System \
        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.lang.VMClass \
+       java.lang.VMClassLoader \
+       java.lang.VMDouble \
+       java.lang.VMFloat \
+       java.lang.VMRuntime \
+       java.lang.VMSecurityManager \
+       java.lang.VMString \
+       java.lang.VMSystem \
+       java.lang.VMThrowable \
+       java.lang.reflect.Array \
+       java.lang.reflect.Constructor \
+       java.lang.reflect.Method \
+       java.lang.reflect.Modifier \
+       java.lang.reflect.Proxy \
+       java.net.DatagramSocketImpl \
+       java.net.NetworkInterface \
+       java.nio.ByteOrder \
+       java.nio.CharBufferImpl \
+       java.nio.DirectByteBufferImpl \
+       java.nio.DoubleBufferImpl \
+       java.nio.FloatBufferImpl \
+       java.nio.IntBufferImpl \
+       java.nio.LongBufferImpl \
+       java.nio.ShortBufferImpl \
        java.security.AccessController \
        java.security.ProtectionDomain \
        java.security.cert.Certificate \
        java.security.cert.X509Certificate \
+       java.sql.Connection \
+       java.text.Collator \
+       java.util.Hashtable \
+       java.util.Locale \
+       java.util.TimeZone \
+       java.util.VMTimeZone \
+       java.util.zip.Deflater \
+       java.util.zip.Inflater \
        javax.swing.Popup \
        javax.swing.UIManager \
-       java.lang.VMClass \
-       java.lang.ThreadGroup \
-       java.lang.VMThread \
-       java.lang.VMDouble \
-       java.lang.VMFloat \
+       @AWTPEERS@
+
+XCLASSES = \
+       java.lang.ClassLoader \
        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.Object \
+       java.lang.String \
+       java.lang.ThreadGroup \
        java.lang.Throwable \
-       java.lang.VMThrowable \
-       java.util.VMTimeZone \
-       gnu.java.security.x509.X509Certificate  \
-       java.lang.JOWENNTest1 \
-       @AWTPEERS@
+       java.lang.VMObject \
+       java.lang.VMThread
 
 checkjvm:
        $(MAKE) -C jvmtst $@