Changed field name className to new declaringClass.

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a82e89718c6151f5544fabcb8256080dca88ca8f..b59781d95c001d6f1371dcc51fa36f855465e8f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1541 2004-11-18 12:17:56Z twisti $
+# $Id: Makefile.am 1572 2004-11-23 16:05:40Z twisti $
 
 @SET_MAKE@
 
@@ -27,6 +27,10 @@ INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@
 
 BOEHM_LIBS = mm/libboehm.a mm/boehm-gc/.libs/libgc.a
 
+if USE_ZLIB
+ZLIB_OBJ = unzip.c
+endif
+
 cacao_SOURCES = \
        builtin.c \
        exceptions.c \
@@ -38,7 +42,7 @@ cacao_SOURCES = \
        statistics.c \
        tables.c \
        typeinfo.c \
-       unzip.c
+       $(ZLIB_OBJ)
 
 cacao_LDADD = \
        jit/libjit.a \
@@ -50,9 +54,7 @@ cacao_LDADD = \
        toolbox/libtoolbox.a \
         @STATIC_CLASSPATH_LIBS@ \
         @DYNAMIC_CLASSPATH_LIBS@ \
-       @AWT_OBJS@ \
-       @ZIP_LIBS@ \
-       @THREAD_LIB@
+       @AWT_OBJS@
 
 
 cacao_DEPENDENCIES = \
@@ -76,15 +78,13 @@ cacaoh_SOURCES = \
        options.c \
        statistics.c \
        tables.c \
-       unzip.c
+       $(ZLIB_OBJ)
 
 cacaoh_LDADD = \
        $(BOEHM_LIBS) \
        classpath/native/jni/java-lang/.libs/libjavalang.a \
        @THREAD_OBJ@ \
-       @ZIP_LIBS@ \
-       toolbox/libtoolbox.a \
-       @THREAD_LIB@
+       toolbox/libtoolbox.a
 
 cacaoh_DEPENDENCIES = \
        $(BOEHM_LIBS) \
@@ -101,25 +101,21 @@ gennativetable_SOURCES = \
        options.c \
        tables.c \
        statistics.c \
-       unzip.c
+       $(ZLIB_OBJ)
 
 gennativetable_LDADD = \
        $(BOEHM_LIBS) \
        classpath/native/jni/java-lang/.libs/libjavalang.a \
        @THREAD_OBJ@ \
-       @ZIP_LIBS@ \
-       toolbox/libtoolbox.a \
-       @THREAD_LIB@
+       toolbox/libtoolbox.a
 
 gennativetable_DEPENDENCIES = \
        $(BOEHM_LIBS) \
        classpath/native/jni/java-lang/.libs/libjavalang.a \
        @THREAD_OBJ@ \
-       @ZIP_LIBS@ \
-       toolbox/libtoolbox.a \
-       @THREAD_LIB@
+       toolbox/libtoolbox.a
 
-all: cacaoh natheaders genoffsets gennativetable cacao
+all: cacaoh genoffsets gennativetable cacao
 
 mm/libboehm.a:
        make -C mm
@@ -147,6 +143,7 @@ natheaders: cacaoh
 nativetable.inc: gennativetable nat/implementednatives.data
        CLASSPATH=$(top_srcdir)/classpath/lib/bootstrap.zip \
        $(top_srcdir)/gennativetable \
+       $(NOGEN_CLASSES) \
        $(CLASSES) \
        > nativetable.inc
 
@@ -156,7 +153,8 @@ nat/implementednatives.data:
 native.c: nativetable.inc
 
 CLASSES= \
-       java.lang.Cloneable \
+       java.lang.JOWENNTest1 \
+       \
        java.lang.reflect.Field \
        java.lang.SecurityManager \
        java.net.DatagramPacket \
@@ -198,7 +196,6 @@ CLASSES= \
        java.lang.Double \
        java.lang.Float \
        java.lang.Integer \
-       java.lang.JOWENNTest1 \
        java.lang.Long \
        java.lang.Math \
        java.lang.Process \
@@ -250,7 +247,7 @@ CLASSES= \
        javax.swing.UIManager \
        @AWTPEERS@
 
-XCLASSES = \
+NOGEN_CLASSES = \
        java.lang.ClassLoader \
        java.lang.Cloneable \
        java.lang.Object \