merge from gnuclasspath branch. I hope I didn't miss or revert any modifications...
[cacao.git] / Makefile.am
index 049144227fd56dcf4f32c954e693927f29861381..aa988691a79595fac0ecc8b15315d0d3a536df5b 100644 (file)
@@ -1,35 +1,41 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 323 2003-05-24 09:02:02Z stefan $
+# $Id: Makefile.am 664 2003-11-21 18:24:01Z jowenn $
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
-ALLSUBDIRS = toolbox mm jit comp nat threads tst doc narray jvmtst
-SUBDIRS = $(ALLSUBDIRS) @SYSDEP_DIR@
-DIST_SUBDIRS = $(ALLSUBDIRS) alpha mips i386 powerpc
-
-EXTRA_DIST = html/cacaoinstall.html html/cacaoman.html html/index.html \
-                               jni.c
-
-CLEANFILES = @SYSDEP_DIR@/asmpart.o \
-             @SYSDEP_DIR@/offsets.h \
-                nativetable.hh \
-                nativetypes.hh
+ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
+SUBDIRS = classpathbin $(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 \
+       jit/@ARCH_DIR@/offsets.h \
+       nativetable.hh \
+       nativetypes.hh
 
 bin_PROGRAMS = cacao
 noinst_PROGRAMS = cacaoh
 
-INCLUDES=-I$(top_srcdir)/@SYSDEP_DIR@ -I$(top_srcdir)/jit -I@SYSDEP_DIR@ -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@ -I$(top_srcdir)/jit
+
+BOEHM_LIBS = mm/libboehm.a mm/boehm-gc/.libs/libgc.a
 
 cacao_SOURCES = \
        asmpart.h \
        builtin.c \
        builtin.h \
-       callargs.h \
        global.h \
-       jit.c \
-       jit.h \
        loader.c \
        loader.h \
        main.c \
@@ -37,102 +43,151 @@ cacao_SOURCES = \
        native.h \
        jni.h \
        tables.c \
-       tables.h
-
-EXTRA_cacao_SOURCES = \
-       compiler.c \
-       compiler.h 
+       tables.h \
+       unzip.c
 
 cacao_LDADD = \
-       @SYSDEP_DIR@/asmpart.o \
-       @COMPILER_OBJECTS@ \
+       jit/libjit.a \
+       jit/loop/libloop.a \
+       jit/@ARCH_DIR@/libarch.a \
        toolbox/libtoolbox.a \
-       @GC_OBJ@ \
-       @THREAD_OBJ@
+       $(BOEHM_LIBS) \
+       @THREAD_OBJ@ \
+       classpathbin/@ARCH_DIR@/native/jni/java-io/.libs/libjavaio.a \
+       classpathbin/@ARCH_DIR@/native/jni/java-nio/.libs/libjavanio.a \
+       classpathbin/@ARCH_DIR@/native/jni/java-net/.libs/libjavanet.a \
+       classpathbin/@ARCH_DIR@/native/jni/java-util/.libs/libjavautil.a \
+       classpathbin/@ARCH_DIR@/native/jni/java-lang/.libs/libjavalang.a \
+       classpathbin/@ARCH_DIR@/native/jni/java-lang/.libs/libjavalangreflect.a @AWT_OBJS@ @ZIP_LIBS@
+
 
 cacao_DEPENDENCIES = \
-       @SYSDEP_DIR@/asmpart.o \
-       @COMPILER_OBJECTS@ \
+       jit/libjit.a \
+       jit/loop/libloop.a \
+       jit/@ARCH_DIR@/libarch.a \
        toolbox/libtoolbox.a \
-       @GC_OBJ@ \
+       $(BOEHM_LIBS) \
        @THREAD_OBJ@
 
-cacaoh_SOURCES = headers.c tables.c loader.c builtin.c
-cacaoh_LDADD = toolbox/libtoolbox.a @GC_OBJ@ @THREAD_OBJ@
-cacaoh_DEPENDENCIES = toolbox/libtoolbox.a @GC_OBJ@ @THREAD_OBJ@
-
-native.c: nativetypes.hh @SYSDEP_DIR@/offsets.h nativetable.hh
-
-nativetypes.hh @SYSDEP_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
-
-@SYSDEP_DIR@/asmpart.o: $(top_srcdir)/@SYSDEP_DIR@/@ASMPART@ @SYSDEP_DIR@/offsets.h
-       @CC@ $(ASMFLAGS) $(INCLUDES) -c -g -o $@ $<
+cacaoh_SOURCES = \
+       headers.c \
+       tables.c \
+       loader.c \
+       builtin.c \
+       unzip.c
+
+cacaoh_LDADD = \
+       toolbox/libtoolbox.a \
+       $(BOEHM_LIBS) \
+       @THREAD_OBJ@  @ZIP_LIBS@
+
+cacaoh_DEPENDENCIES = \
+       toolbox/libtoolbox.a \
+       $(BOEHM_LIBS) \
+       @THREAD_OBJ@
+
+
+nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
+       CLASSPATH=./classpathbin/@ARCH_DIR@/lib ./cacaoh \
+       java.lang.Class \
+       java.io.FileDescriptor \
+       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 \
+       java.net.PlainSocketImpl \
+       java.net.DatagramSocketImpl \
+       java.net.InetAddress \
+       java.net.DatagramPacket \
+       java.net.PlainDatagramSocketImpl \
+       java.nio.CharBufferImpl \
+       java.nio.channels.FileChannelImpl \
+       java.nio.DoubleBufferImpl \
+       java.nio.LongBufferImpl \
+       java.nio.ByteOrder \
+       java.nio.ShortBufferImpl \
+       java.nio.IntBufferImpl \
+       java.nio.DirectByteBufferImpl \
+       java.nio.FloatBufferImpl \
+       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.Integer \
+       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.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.VMDouble \
+       java.lang.VMFloat \
+       java.lang.Cloneable \
+       java.lang.VMObject \
+       java.lang.VMClassLoader \
+       java.io.PrintStream \
+       java.lang.VMSystem \
+       java.util.Properties \
+       java.lang.Runtime \
+       java.lang.Throwable \
+       java.lang.String \
+       gnu.java.security.x509.X509Certificate  \
+       java.lang.JOWENNTest1 \
+       @AWTPEERS@
+
+native.c: nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh
 
 checkjvm:
        $(MAKE) -C jvmtst $@
 
+
 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t
 ## c-basic-offset: 4
-## tab-width: 4
+## tab-width: 8
 ## compile-command: "automake --add-missing"
 ## End: