Fixed portability problems related to defines with spaces (# define) and created...

[cacao.git] / Makefile

diff --git a/Makefile b/Makefile
index 1d16edf1492e25b6e202bbaca721b8b78e68ee92..06bb5c98241994f7c637739727c359cb5e72f644 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/09/27
+# Last Change: 1998/10/30
 #
 #
 # ATTENTION: This version of the makefile only works with gmake.
@@ -22,6 +22,8 @@
 #
 ################################################################################
 
+MAKE = make
+
 VERSION_MAJOR = 0
 VERSION_MINOR = 30
 VERSION_POSTFIX = 
@@ -42,18 +44,18 @@ THREAD_OBJ =
 THREAD_CFLAGS =
 endif
 
-#CC = gcc
+#CC = cc
 #CFLAGS = -g -mieee -Wall $(THREAD_CFLAGS)
 #CFLAGS = -mieee -O3 -Wall $(THREAD_CFLAGS)
 
-CC = cc
+CC = gcc
 #CFLAGS = -g3 -ieee $(THREAD_CFLAGS)
 CFLAGS = -O3 -ieee $(THREAD_CFLAGS)
 
 OBJ = main.o tables.o loader.o compiler.o newcomp.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
+mm/mm.o
 
 cacao: $(OBJ)
        $(CC) $(CFLAGS) -o cacao $(OBJ) -lm
@@ -84,17 +86,17 @@ global.h: sysdep/types.h toolbox/*.h
        touch global.h
 
 toolbox/toolbox.a: toolbox/*.c toolbox/*.h
-       cd toolbox; make toolbox.a "CFLAGS=$(CFLAGS)" "CC=$(CC)" 
+       cd toolbox; $(MAKE) toolbox.a "CFLAGS=$(CFLAGS)" "CC=$(CC)" 
 
 ifeq ($(USE_THREADS),YES)
 threads/threads.a: threads/*.c threads/*.h sysdep/threads.h
-       cd threads; make threads.a "USE_THREADS=$(USE_THREADS)" "CFLAGS=$(CFLAGS)" "CC=$(CC)" 
+       cd threads; $(MAKE) threads.a "USE_THREADS=$(USE_THREADS)" "CFLAGS=$(CFLAGS)" "CC=$(CC)" 
 endif
 
 mm/mm.o: mm/*.[ch] mm/Makefile
-       cd mm; make mm.o "USE_THREADS=$(USE_THREADS)" "CFLAGS=$(CFLAGS)" "CC=$(CC)"
+       cd mm; $(MAKE) mm.o "USE_THREADS=$(USE_THREADS)" "CFLAGS=$(CFLAGS)" "CC=$(CC)"
 
-asmpart.o: sysdep/asmpart.c
+asmpart.o: sysdep/asmpart.c sysdep/offsets.h
        rm -f asmpart.s
        $(CC) -E sysdep/asmpart.c > asmpart.s
        $(CC) -c -o asmpart.o asmpart.s
@@ -106,9 +108,9 @@ asmpart.o: sysdep/asmpart.c
 clean:
        rm -f *.o cacao cacaoh cacao.tgz nativetable.hh nativetypes.hh \
              core tst/core
-       cd toolbox; make clean
-       cd threads; make clean
-
+       cd toolbox; $(MAKE) clean
+       cd threads; $(MAKE) clean
+       cd mm; $(MAKE) clean
 tar:
        rm -f cacao.tgz cacao.tar
        tar -cvf cacao.tar Makefile */Makefile README COPYRIGHT tst/*.java \
@@ -142,20 +144,20 @@ config-alpha:
        ln -s alpha sysdep
        rm -f threads/sysdep
        ln -s ../sysdep threads/sysdep
-       make clean
+       $(MAKE) clean
 
 config-sparc:
        rm -f sysdep
        ln -s sparc sysdep
        rm -f threads/sysdep
        ln -s ../sysdep threads/sysdep
-       make clean
+       $(MAKE) clean
 
 
 
 ##################### generation of NATIVE - header files ######################
 
-nativetypes.hh nativetable.hh : cacaoh
+sysdep/offsets.h nativetypes.hh nativetable.hh : cacaoh
        ./cacaoh java.lang.Object \
        java.lang.String \
        java.lang.Class \
@@ -181,4 +183,4 @@ nativetypes.hh nativetable.hh : cacaoh
        java.util.Properties \
        java.util.Date
        
-       
\ No newline at end of file
+