some words for intro and overview by andi

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9c61a44638256ff5642f44958eeade2cf63f85fc..4a8792b315b715fa343a38131f6ff3e8a5b080fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 736 2003-12-13 15:52:46Z stefan $
+# $Id: Makefile.am 993 2004-03-30 21:36:03Z twisti $
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
 ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
-SUBDIRS = classpathbin $(ALLSUBDIRS)
+SUBDIRS = gnuclasspathnat $(ALLSUBDIRS)
 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \
@@ -18,6 +18,7 @@ EXTRA_DIST = \
        nativecalls.h
 
 CLEANFILES = \
+       stamp-nat \
        jit/@ARCH_DIR@/offsets.h \
        nativetable.hh \
        nativetypes.hh
@@ -51,47 +52,62 @@ 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 \
+       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 \
+       @AWT_OBJS@ \
+       @ZIP_LIBS@
+
 
 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 \
+       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 \
+       @AWT_OBJS@ \
+       @ZIP_LIBS@
 
 cacaoh_SOURCES = \
+       builtin.c \
        headers.c \
-       tables.c \
        loader.c \
-       builtin.c \
+       tables.c \
        unzip.c
 
 cacaoh_LDADD = \
-       toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@  @ZIP_LIBS@
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       @THREAD_OBJ@ \
+       @ZIP_LIBS@ \
+       toolbox/libtoolbox.a
 
 cacaoh_DEPENDENCIES = \
-       toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
-       @THREAD_OBJ@
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       @THREAD_OBJ@ \
+       @ZIP_LIBS@ \
+       toolbox/libtoolbox.a
 
 
 nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
        test -f stamp-nat || \
-       CLASSPATH=./classpathbin/@ARCH_DIR@/lib ./cacaoh \
+       CLASSPATH=./gnuclassfiles ./cacaoh \
        java.lang.String \
        java.lang.Class \
        java.io.FileDescriptor \
@@ -161,9 +177,10 @@ 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 \
@@ -179,9 +196,11 @@ 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.Throwable \
+       java.lang.VMThrowable \
        gnu.java.security.x509.X509Certificate  \
        java.lang.JOWENNTest1 \
        @AWTPEERS@
@@ -192,9 +211,6 @@ native.c: nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh
 checkjvm:
        $(MAKE) -C jvmtst $@
 
-clean:
-       rm -f stamp-nat
-
 
 ## Local variables:
 ## mode: Makefile