X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mate.git;a=blobdiff_plain;f=Makefile;h=268c1c0c8729e5547826116f9e925c597cc77e99;hp=00007fa1640248a1d9ba825f62cd552dbebe6aba;hb=HEAD;hpb=94985402292306da1db46b1750927ef46bdb87d3

diff --git a/Makefile b/Makefile
index 00007fa..268c1c0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,16 +10,24 @@ HS_BOOT := $(wildcard Mate/*.hs-boot)
 BUILD := build
 B_RELEASE := $(BUILD)/release
 B_STATIC := $(BUILD)/static
-B_DEBUG := $(BUILD)/release
-O_STATIC_FILES = $(shell ls $(B_STATIC)/Mate/*.o) $(wildcard $(B_STATIC)/ffi/*.o)
+B_DEBUG := $(BUILD)/debug
 PACKAGES_ := bytestring harpy hs-java plugins
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
-GHC_OPT := -I. -Wall -O0 -fno-warn-unused-do-bind -rtsopts -cpp -pgmP cpphs -optP --cpp
+
+GHC_CPP := -DARCH_X86
+
+GHC_OPT  = -I. -O0 -Wall -fno-warn-unused-do-bind -fwarn-tabs
+# TODO: define this in cabal... (see cpu package @ hackage)
+# see *.gdb target. also useful for profiling (-p at call)
+GHC_OPT += -rtsopts # -prof -auto-all
+GHC_OPT += $(GHC_CPP)
+
+# dunno anymore? some linker stuff regarding GHCi
 GHC_LD := -optl-Xlinker -optl-x
 
 
-.PHONY: all test clean ghci
+.PHONY: all tests clean ghci hlint
 
 all: mate
 
@@ -46,6 +54,11 @@ COMPILEF = $(basename $@).compile
 ffi/native.o: ffi/native.c
 	ghc -Wall -O2 -c $< -o $@
 
+runtime: jmate/lang/MateRuntime.java
+	javac jmate/lang/MateRuntime.java
+	javah  -o rts/mock/jmate_lang_MateRuntime.h jmate.lang.MateRuntime
+	gcc -shared -fPIC -I$(JAVA_HOME)/include rts/mock/jmate_lang_MateRuntime.c -I./rts/mock -o rts/mock/libMateRuntime.so 
+
 GHCCALL = ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir
 mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
 	@mkdir -p $(B_RELEASE)
@@ -55,42 +68,28 @@ mate.static: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILE
 	@mkdir -p $(B_STATIC)
 	$(GHCCALL) $(B_STATIC) -static
 
-%.dbg: %.class mate.dbg
-	./mate.dbg $(basename $<)
-
-%.gdb: %.class mate.dbg
-	gdb -x .gdbcmds -q --args mate.dbg $(basename $<) +RTS -V0 --install-signal-handlers=no
-
-ifeq (${DBGFLAGS},)
-DEBUGFLAGS = -DDBG_JIT -DDBG_MP
-else
-DEBUGFLAGS = ${DBGFLAGS}
-endif
-mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
-	@mkdir -p $(B_DEBUG)/{ffi,Mate,}
-	gcc -Wall $(DEBUGFLAGS) -O0 -c ffi/trap.c -o $(B_DEBUG)/ffi/trap.o
-	ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs $(B_DEBUG)/ffi/trap.o -o $@ $(GHC_LD) -outputdir $(B_DEBUG)
+%.gdb: %.class mate
+	gdb -x .gdbcmds -q --args mate $(basename $<) +RTS -V0 --install-signal-handlers=no
 
 clean:
-	rm -rf $(BUILD) mate mate.static mate.dbg tags ffi/native.o \
+	rm -rf $(BUILD) mate mate.static ffi/native.o \
 		tests/*.class Mate/*_stub.* \
-		jmate/lang/*.class jmate/io/*.class java/io/*.class \
-		java/lang/{Integer,Character,String,System}.class
+		$(CLASS_FILES) \
+		scratch/*.class
 
 ghci: mate.static
-	ghci -I. $(PACKAGES) $(O_STATIC_FILES) -outputdir $(B_STATIC) Mate.hs
+	ghci -I. $(PACKAGES) -outputdir $(B_STATIC) Mate.hs $(GHC_CPP)
 
-tags: mate
+tags: mate.static
 	@# @-fforce-recomp, see
 	@# http://stackoverflow.com/questions/7137414/how-do-i-force-interpretation-in-hint
 	@# @-fobject-code: force to generate native code (necessary for ffi stuff)
-	ghc -I. -fforce-recomp -fobject-code $(PACKAGES) Mate.hs $(O_STATIC_FILES) -outputdir $(B_STATIC) -e :ctags
+	ghc -I. -fforce-recomp -fobject-code $(PACKAGES) Mate.hs -outputdir $(B_STATIC) -e :ctags $(GHC_CPP)
 
 hlint:
-	@# hlint isn't able to evaluate CPP comments correctly *sigh*
-	@cp debug.h debug_tmp.h
-	@# so we remove them "by hand", for hlint
-	@gcc -E -x c -fpreprocessed -dD -E debug_tmp.h | grep -v 'debug_tmp.h' > debug.h
-	@# ignore error code from hlint
-	-hlint Mate.hs Mate/
-	@mv debug_tmp.h debug.h
+	hlint Mate.hs Mate/
+
+scratch: mate $(wildcard jmate/lang/*.java) scratch/GCTest.java
+	javac $(wildcard jmate/lang/*.java)
+	javac scratch/GCTest.java
+	./mate scratch.GCTest