Safety first.

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b75e5e52cad95afc46410df765be63ff26b06cd..dedec02a5f31fd7159cbf1a29f5d18c8a22e4f78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 770 2003-12-13 23:08:38Z stefan $
+# $Id: Makefile.am 898 2004-01-21 19:36:48Z 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 = \
@@ -51,48 +51,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 \