Safety first.

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6d69aec0b381594872e43f060ce37f92ce22f643..dedec02a5f31fd7159cbf1a29f5d18c8a22e4f78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,23 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 667 2003-11-21 19:05:06Z jowenn $
+# $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 = \
        html/cacaoinstall.html \
        html/cacaoman.html \
        html/index.html \
-       jni.c \
        main.h \
        natcalls.h \
        nativecalls.h
 
 CLEANFILES = \
-       jit/@ARCH_DIR@/asmpart.o \
        jit/@ARCH_DIR@/offsets.h \
        nativetable.hh \
        nativetypes.hh
@@ -41,54 +39,74 @@ cacao_SOURCES = \
        main.c \
        native.c \
        native.h \
+       jni.c \
        jni.h \
        tables.c \
        tables.h \
-       unzip.c
+       unzip.c \
+       typeinfo.c \
+       typeinfo.h
 
 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
-       CLASSPATH=./classpathbin/@ARCH_DIR@/lib ./cacaoh \
+       test -f stamp-nat || \
+       CLASSPATH=./gnuclassfiles ./cacaoh \
        java.lang.String \
        java.lang.Class \
        java.io.FileDescriptor \
@@ -136,7 +154,12 @@ nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makef
        java.lang.reflect.Proxy \
        java.lang.Double \
        java.lang.Compiler \
+       java.lang.Byte \
+       java.lang.Character \
        java.lang.Integer \
+       java.lang.Long \
+       java.lang.Short \
+       java.lang.Boolean \
        java.lang.StackTraceElement \
        java.lang.Float \
        java.lang.Object \
@@ -177,12 +200,16 @@ 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 $@
 
+clean:
+       rm -f stamp-nat
+
 
 ## Local variables:
 ## mode: Makefile