Added java.util.VMTimeZone to CLASSES.

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 85c73ace61fdab0883f6f3f8e7d0cd002fd2dbab..0bec1846598a38973f88ae259af3843739581670 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1262 2004-07-01 11:10:43Z jowenn $
+# $Id: Makefile.am 1457 2004-11-05 15:05:14Z twisti $
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
-ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
-SUBDIRS = gnuclasspathnat $(ALLSUBDIRS)
+ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst classpath
+SUBDIRS = $(ALLSUBDIRS)
 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \
@@ -18,13 +18,10 @@ EXTRA_DIST = \
        nativecalls.h
 
 CLEANFILES = \
-       stamp-nat \
-       jit/@ARCH_DIR@/offsets.h \
-       nativetable.hh \
-       nativetypes.hh
+       nativetable.inc
 
-bin_PROGRAMS = cacao
-noinst_PROGRAMS = cacaoh gennativetable genoffsets
+bin_PROGRAMS = cacao cacaoh
+noinst_PROGRAMS = gennativetable genoffsets
 
 INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@
 
@@ -34,6 +31,8 @@ cacao_SOURCES = \
        asmpart.h \
        builtin.c \
        builtin.h \
+       exceptions.c \
+       exceptions.h \
        global.h \
        jni.c \
        jni.h \
@@ -60,12 +59,9 @@ 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/fdlibm/.libs/libfdlibm.a \
+        @STATIC_CLASSPATH_LIBS@ \
+        @DYNAMIC_CLASSPATH_LIBS@ \
        @AWT_OBJS@ \
        @ZIP_LIBS@ \
        @THREAD_LIB@
@@ -79,12 +75,7 @@ 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 \
+        @STATIC_CLASSPATH_LIBS@ \
        nativetable.inc \
        @AWT_OBJS@ \
        @ZIP_LIBS@
@@ -92,6 +83,7 @@ cacao_DEPENDENCIES = \
 cacaoh_SOURCES = \
        builtin.c \
        cacaoh.c \
+       exceptions.c \
        headers.c \
        loader.c \
        options.c \
@@ -101,7 +93,7 @@ cacaoh_SOURCES = \
 
 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 \
@@ -109,13 +101,14 @@ 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 \
+       exceptions.c \
        gennativetable.c \
        headers.c \
        loader.c \
@@ -126,17 +119,19 @@ gennativetable_SOURCES = \
 
 gennativetable_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 \
        @THREAD_LIB@
 
 natheaders: cacaoh
-       CLASSPATH=$(top_srcdir)/gnuclassfiles ./cacaoh $(CLASSES)
+       CLASSPATH=$(top_srcdir)/classpath/lib/bootstrap.zip ./cacaoh $(CLASSES)
 
-nativetable.inc: gennativetable
-       CLASSPATH=$(top_srcdir)/gnuclassfiles $(top_srcdir)/gennativetable $(CLASSES) > nativetable.inc
+nativetable.inc: gennativetable nat/implementednatives.data
+       CLASSPATH=$(top_srcdir)/classpath/lib/bootstrap.zip $(top_srcdir)/gennativetable $(CLASSES) > nativetable.inc
+
+native.c: nativetable.inc
 
 CLASSES= \
        java.lang.String \
@@ -234,6 +229,7 @@ CLASSES= \
        java.lang.VMRuntime \
        java.lang.Throwable \
        java.lang.VMThrowable \
+       java.util.VMTimeZone \
        gnu.java.security.x509.X509Certificate  \
        java.lang.JOWENNTest1 \
        @AWTPEERS@