*** empty log message ***

[cacao.git] / Makefile

diff --git a/Makefile b/Makefile
index 06bb5c98241994f7c637739727c359cb5e72f644..94211c85a69cbc1072209c93e4f23538aa7b469b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-###############################################################################
+################################################################################
 #                    Makefile for the JavaVM - compiler CACAO                  #
 ################################################################################
 #
@@ -9,7 +9,7 @@
 # Authors: Reinhard Grafl      EMAIL: cacao@complang.tuwien.ac.at
 #          Andreas  Krall      EMAIL: cacao@complang.tuwien.ac.at
 #
-# Last Change: 1998/10/30
+# Last Change: $Id: Makefile 50 1998-11-09 23:01:59Z phil $
 #
 #
 # ATTENTION: This version of the makefile only works with gmake.
@@ -22,19 +22,17 @@
 #
 ################################################################################
 
-MAKE = make
-
 VERSION_MAJOR = 0
 VERSION_MINOR = 30
-VERSION_POSTFIX = 
+VERSION_POSTFIX = p2
 
 VERSION_STRING=$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POSTFIX)
 
 ##################### generation of the excutable ##############################
 
 # Enabling/disabling thread support
-USE_THREADS = YES
-#USE_THREADS = NO
+# USE_THREADS = YES
+USE_THREADS = NO
 
 ifeq ($(USE_THREADS),YES)
 THREAD_OBJ = threads/threads.a
@@ -47,22 +45,30 @@ endif
 #CC = cc
 #CFLAGS = -g -mieee -Wall $(THREAD_CFLAGS)
 #CFLAGS = -mieee -O3 -Wall $(THREAD_CFLAGS)
+#LFLAGS = -lm
+
+CC = cc
+CFLAGS = -g3 -ieee $(THREAD_CFLAGS)
+#CFLAGS = -O3 -ieee $(THREAD_CFLAGS)
+LFLAGS = -lm
 
-CC = gcc
-#CFLAGS = -g3 -ieee $(THREAD_CFLAGS)
-CFLAGS = -O3 -ieee $(THREAD_CFLAGS)
+# IRIX 6.5 MIPSPro 7.2.1
+#CC = cc
+#CFLAGS = -g $(THREAD_CFLAGS) -DMAP_ANONYMOUS=0 -woff 1048,1110,1164,1515
+#CFLAGS = -O2 -OPT:Olimit=0 $(THREAD_CFLAGS) -DMAP_ANONYMOUS=0
+#LFLAGS = -lm -lelfutil
 
-OBJ = main.o tables.o loader.o compiler.o newcomp.o builtin.o asmpart.o \
+OBJ = main.o tables.o loader.o compiler.o jit.o builtin.o asmpart.o \
        toolbox/toolbox.a native.o $(THREAD_OBJ) mm/mm.o
 OBJH = headers.o tables.o loader.o builtin.o toolbox/toolbox.a $(THREAD_OBJ) \
 mm/mm.o
 
 cacao: $(OBJ)
-       $(CC) $(CFLAGS) -o cacao $(OBJ) -lm
+       $(CC) $(CFLAGS) -o cacao $(OBJ) $(LFLAGS)
 cacaoh: $(OBJH)
-       $(CC) $(CFLAGS) -o cacaoh $(OBJH) -lm
+       $(CC) $(CFLAGS) -o cacaoh $(OBJH) $(LFLAGS)
 
-main.o: main.c global.h tables.h compiler.h ncomp/ncomp.h loader.h \
+main.o: main.c global.h tables.h loader.h jit.h compiler.h \
         asmpart.h builtin.h native.h
 
 headers.o:  headers.c global.h tables.h loader.h
@@ -72,8 +78,8 @@ loader.o:   loader.c global.h loader.h tables.h native.h asmpart.h
 compiler.o: builtin.h compiler.h global.h loader.h tables.h native.h \
             asmpart.h compiler.c comp/*.c sysdep/gen.c sysdep/disass.c
 
-newcomp.o:  builtin.h ncomp/ncomp.h global.h loader.h tables.h native.h \
-            asmpart.h ncomp/ncompdef.h ncomp/*.c sysdep/ngen.h sysdep/ngen.c sysdep/disass.c
+jit.o:  builtin.h jit.h global.h loader.h tables.h native.h asmpart.h \
+            jit/jitdef.h jit/*.c sysdep/ngen.h sysdep/ngen.c sysdep/disass.c
 
 builtin.o: builtin.c global.h loader.h builtin.h tables.h sysdep/native-math.h
 
@@ -111,11 +117,31 @@ clean:
        cd toolbox; $(MAKE) clean
        cd threads; $(MAKE) clean
        cd mm; $(MAKE) clean
+
+
+### DISTRIBUTION TARGETS ###
+
+DISTRIBUTION_FILES = \
+Makefile \
+*/Makefile \
+README \
+COPYRIGHT \
+tst/*.java \
+doc/*.doc \
+html/*.html \
+*.[ch] \
+comp/*.[ch] \
+jit/*.[ch] \
+alpha/*.doc \
+alpha/*.[ch] \
+nat/*.[ch] \
+toolbox/*.[ch] \
+threads/*.[ch] \
+# sparc/*.[ch]
+
 tar:
        rm -f cacao.tgz cacao.tar
-       tar -cvf cacao.tar Makefile */Makefile README COPYRIGHT tst/*.java \
-           doc/*.doc html/*.html *.[ch] comp/*.[ch] ncomp/*.[ch] alpha/*.doc alpha/*.[ch] \
-           nat/*.[ch] toolbox/*.[ch] threads/*.[ch] # sparc/*.[ch]
+       tar -cvf cacao.tar $(DISTRIBUTION_FILES)
        ls -l cacao.tar
        gzip -9 cacao.tar
        mv cacao.tar.gz cacao.tgz
@@ -124,10 +150,7 @@ tar:
 dist:
        rm -rf cacao-$(VERSION_STRING).tar.gz cacao-$(VERSION_STRING);
        ( mkdir cacao-$(VERSION_STRING); \
-#        tar -cf cacao-$(VERSION_STRING).tar -T FILES; \
-         tar -cvf cacao-$(VERSION_STRING).tar Makefile */Makefile README COPYRIGHT \
-           tst/*.java doc/*.doc html/*.html *.[ch] comp/*.[ch] ncomp/*.[ch] \
-           alpha/*.doc alpha/*.[ch] nat/*.[ch] toolbox/*.[ch] threads/*.[ch]; \
+         tar -cvf cacao-$(VERSION_STRING).tar $(DISTRIBUTION_FILES); \
          cd cacao-$(VERSION_STRING); \
          tar -xf ../cacao-$(VERSION_STRING).tar; \
          cd ..; \
@@ -153,6 +176,12 @@ config-sparc:
        ln -s ../sysdep threads/sysdep
        $(MAKE) clean
 
+config-mips:
+       rm -f sysdep
+       ln -s mips sysdep
+       rm -f threads/sysdep
+       ln -s ../sysdep threads/sysdep
+       $(MAKE) clean
 
 
 ##################### generation of NATIVE - header files ######################
@@ -182,5 +211,3 @@ sysdep/offsets.h nativetypes.hh nativetable.hh : cacaoh
 \
        java.util.Properties \
        java.util.Date
-       
-