projects / cacao.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix cacao/gennativetable to not crash on zipfile input, whole classpath in cacaodev...
[cacao.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index aa988691a79595fac0ecc8b15315d0d3a536df5b..01d032c11c780bc51deceddc3a7ff163f482bc83 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,32 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 664 2003-11-21 18:24:01Z jowenn $
+# $Id: Makefile.am 1264 2004-07-01 14:21:05Z jowenn $
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
 ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
-SUBDIRS = classpathbin $(ALLSUBDIRS)
+SUBDIRS = classpath $(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
 
 bin_PROGRAMS = cacao
-noinst_PROGRAMS = cacaoh
+noinst_PROGRAMS = cacaoh 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
 
@@ -36,61 +35,114 @@ cacao_SOURCES = \
        builtin.c \
        builtin.h \
        global.h \
+       jni.c \
+       jni.h \
        loader.c \
        loader.h \
        main.c \
        native.c \
        native.h \
-       jni.h \
+       options.c \
+       options.h \
+       statistics.c \
+       statistics.h \
        tables.c \
        tables.h \
+       typeinfo.c \
+       typeinfo.h \
        unzip.c
 
 cacao_LDADD = \
        jit/libjit.a \
        jit/loop/libloop.a \
        jit/@ARCH_DIR@/libarch.a \
-       toolbox/libtoolbox.a \
+       nat/libnat.a \
        $(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@
+       toolbox/libtoolbox.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@ \
+       @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 \
+       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 \
        headers.c \
-       tables.c \
        loader.c \
-       builtin.c \
+       options.c \
+       statistics.c \
+       tables.c \
        unzip.c
 
 cacaoh_LDADD = \
-       toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@  @ZIP_LIBS@
+       classpath/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@
+       classpath/native/jni/java-lang/.libs/libjavalang.a \
+       @THREAD_OBJ@ \
+       @ZIP_LIBS@ \
+       toolbox/libtoolbox.a
+
+gennativetable_SOURCES = \
+       builtin.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/glibj.zip ./cacaoh $(CLASSES)
 
-nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
-       CLASSPATH=./classpathbin/@ARCH_DIR@/lib ./cacaoh \
+nativetable.inc: gennativetable
+       CLASSPATH=$(top_srcdir)/classpath/lib/glibj.zip $(top_srcdir)/gennativetable $(CLASSES) > 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 \
@@ -103,6 +155,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 \
@@ -113,13 +168,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 \
@@ -127,6 +181,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 \
@@ -135,7 +190,12 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef
        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 \
@@ -152,17 +212,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 \
@@ -170,16 +228,16 @@ 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.String \
+       java.lang.VMThrowable \
        gnu.java.security.x509.X509Certificate  \
        java.lang.JOWENNTest1 \
        @AWTPEERS@
 
-native.c: nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh
-
 checkjvm:
        $(MAKE) -C jvmtst $@
 
inofficial http://www.cacaojvm.org/ git mirror