Merged everything with MIPS version

[cacao.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2fbfbe66e170f9c667961e9ea4d9035f96ab3b68..e3d8dfd6ab886d057dfd6eac0c6c40bf7764efd8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 120 1999-01-20 15:41:38Z andi $
+# $Id: Makefile.am 221 2003-02-05 14:09:38Z stefan $
+
+@SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
-SUBDIRS = toolbox mm alpha jit comp nat threads mips
+SUBDIRS = toolbox mm alpha i386 jit comp nat threads mips tst doc narray jvmtst
 
 EXTRA_DIST = html/cacaoinstall.html html/cacaoman.html html/index.html \
-                        doc/cacao.1
+                               jni.c
 
 CLEANFILES = @SYSDEP_DIR@/asmpart.o \
-                        @SYSDEP_DIR@/asmpart.s \
              @SYSDEP_DIR@/offsets.h \
                 nativetable.hh \
                 nativetypes.hh
 
 bin_PROGRAMS = cacao
 noinst_PROGRAMS = cacaoh
-man_MANS = doc/cacao.1
 
-INCLUDES=-I/usr/include -I$(top_srcdir)/@SYSDEP_DIR@ -I$(top_srcdir)/jit -I@SYSDEP_DIR@ -I$(top_srcdir)
+INCLUDES=-I$(top_srcdir)/@SYSDEP_DIR@ -I$(top_srcdir)/jit -I@SYSDEP_DIR@ -I$(top_srcdir)
 
 cacao_SOURCES = \
        asmpart.h \
@@ -34,10 +34,13 @@ cacao_SOURCES = \
        main.c \
        native.c \
        native.h \
+       jni.h \
        tables.c \
-       tables.h
+       tables.h 
 
-EXTRA_cacao_SOURCES = compiler.c compiler.h
+EXTRA_cacao_SOURCES = \
+       compiler.c \
+       compiler.h 
 
 cacao_LDADD = \
        @SYSDEP_DIR@/asmpart.o \
@@ -63,40 +66,67 @@ nativetypes.hh @SYSDEP_DIR@/offsets.h nativetable.hh: cacaoh
        ./cacaoh \
                java.lang.Object \
                java.lang.String \
-               java.lang.Class \
                java.lang.ClassLoader \
+               java.lang.Class \
                java.lang.Compiler \
+               java.lang.Integer \
                java.lang.Double \
                java.lang.Float \
                java.lang.Math \
+               java.lang.Package \
                java.lang.Runtime \
                java.lang.SecurityManager \
+               java.lang.Exception \
+               java.io.PrintStream \
+               java.io.InputStream \
                java.lang.System \
                java.lang.Thread \
                java.lang.ThreadGroup \
                java.lang.Throwable \
-               java.io.File \
+               java.lang.reflect.Array \
+               java.lang.reflect.Constructor \
+               java.lang.reflect.Field \
+               java.lang.reflect.Method \
+               java.lang.reflect.Modifier \
                java.io.FileDescriptor \
                java.io.FileInputStream \
                java.io.FileOutputStream \
-               java.io.PrintStream \
+               java.io.FileSystem \
+               java.io.ObjectInputStream \
+               java.io.ObjectStreamClass \
                java.io.RandomAccessFile \
+               java.util.ResourceBundle \
+               java.util.jar.JarFile \
+               java.util.zip.Adler32 \
+               java.util.zip.CRC32 \
+               java.util.zip.Deflater \
+               java.util.zip.Inflater \
+               java.util.zip.ZipEntry \
+               java.util.zip.ZipFile \
                java.util.Properties \
-               java.util.Date
-
-@SYSDEP_DIR@/asmpart.o: $(top_srcdir)/@SYSDEP_DIR@/asmpart.c @SYSDEP_DIR@/offsets.h
-       rm -f @SYSDEP_DIR@/asmpart.s
-       @CPP@ $(INCLUDES) $(top_srcdir)/@SYSDEP_DIR@/asmpart.c \
-                       > @SYSDEP_DIR@/asmpart.s
-       @CC@ $(CFLAGS) $(INCLUDES) -c -o @SYSDEP_DIR@/asmpart.o \
-                       @SYSDEP_DIR@/asmpart.s
-       rm -f asmpart.s
+               java.util.Date \
+               java.math.BigInteger \
+               java.net.InetAddress \
+               java.net.InetAddressImpl \
+               java.net.DatagramPacket \
+               java.net.PlainDatagramSocketImpl \
+               java.net.SocketImpl \
+               java.net.PlainSocketImpl \
+               java.net.SocketInputStream \
+               java.net.SocketOutputStream \
+               java.security.PrivilegedActionException \
+               java.security.PrivilegedAction \
+               java.security.PrivilegedExceptionAction \
+               java.security.AccessController \
+               java.io.File \
+               java.io.UnixFileSystem \
+               java.lang.ClassLoader_NativeLibrary
 
-compiler.o: builtin.h compiler.h global.h loader.h tables.h native.h \
-            asmpart.h compiler.c comp/*.c \
-            @SYSDEP_DIR@/gen.c @SYSDEP_DIR@/disass.c
-       @CC@ $(CFLAGS) $(INCLUDES) -c compiler.c
+@SYSDEP_DIR@/asmpart.o: $(top_srcdir)/@SYSDEP_DIR@/@ASMPART@ @SYSDEP_DIR@/offsets.h
+       @CC@ $(CFLAGS) $(INCLUDES) -c -g -o $@ $<
 
+checkjvm:
+       $(MAKE) -C jvmtst $@
 
 ## Local variables:
 ## mode: Makefile