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 e4d86bf1948a6b6e0e32975b0704dab1bf3b470e..01d032c11c780bc51deceddc3a7ff163f482bc83 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1173 2004-06-16 14:56:18Z 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 = gnuclasspathnat $(ALLSUBDIRS)
+SUBDIRS = classpath $(ALLSUBDIRS)
 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \
@@ -24,7 +24,7 @@ CLEANFILES = \
        nativetypes.hh
 
 bin_PROGRAMS = cacao
-noinst_PROGRAMS = cacaoh
+noinst_PROGRAMS = cacaoh gennativetable genoffsets
 
 INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@
 
@@ -35,18 +35,22 @@ cacao_SOURCES = \
        builtin.c \
        builtin.h \
        global.h \
+       jni.c \
+       jni.h \
        loader.c \
        loader.h \
        main.c \
        native.c \
        native.h \
-       jni.c \
-       jni.h \
+       options.c \
+       options.h \
+       statistics.c \
+       statistics.h \
        tables.c \
        tables.h \
-       unzip.c \
        typeinfo.c \
-       typeinfo.h
+       typeinfo.h \
+       unzip.c
 
 cacao_LDADD = \
        jit/libjit.a \
@@ -56,12 +60,12 @@ cacao_LDADD = \
        $(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 \
-       gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.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@
@@ -75,25 +79,29 @@ cacao_DEPENDENCIES = \
        $(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 \
-       gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.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 \
        loader.c \
+       options.c \
+       statistics.c \
        tables.c \
        unzip.c
 
 cacaoh_LDADD = \
        $(BOEHM_LIBS) \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \
        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a \
@@ -101,15 +109,36 @@ cacaoh_LDADD = \
 
 cacaoh_DEPENDENCIES = \
        $(BOEHM_LIBS) \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       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
 
-nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
-       test -f stamp-nat || \
-       CLASSPATH=$(top_srcdir)/gnuclassfiles ./cacaoh \
+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)
+
+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 \
@@ -126,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 \
@@ -187,9 +219,6 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef
        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 \
@@ -208,9 +237,6 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef
        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
 
 checkjvm:
        $(MAKE) -C jvmtst $@