X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=6dececa0d35ad99eafa605a74e38a10a24731275;hb=7e77d502bbc94d702ec96bc0e1a84b0f86dcbbc3;hp=b9033167dd764159eda5d0945982947257983124;hpb=958b6c1e385d85e4231ef62c7dde9cb840cae5c2;p=mate.git

diff --git a/Makefile b/Makefile
index b903316..6dececa 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
+
+# use `cpphs'
+GHC_CPP := -cpp -pgmP cpphs -optP --cpp
+
+GHC_OPT  = -I. -O0 -Wall -fno-warn-unused-do-bind
+# 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
 
@@ -40,7 +48,7 @@ COMPILEF = $(basename $@).compile
 %.class: %.java
 	@if [ -f $(COMPILEF) ]; \
 		then $(SHELL) $(COMPILEF); \
-		else $(JAVAC) $<; fi
+		else $(JAVAC) $(JAVA_FILES) $<; fi
 	@echo "JAVAC $<"
 
 ffi/native.o: ffi/native.c
@@ -58,6 +66,9 @@ mate.static: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILE
 %.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
@@ -69,18 +80,19 @@ mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
 	ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs $(B_DEBUG)/ffi/trap.o -o $@ $(GHC_LD) -outputdir $(B_DEBUG)
 
 clean:
-	rm -rf $(BUILD) mate mate.dbg tags ffi/native.o tests/*.class Mate/*_stub.* \
+	rm -rf $(BUILD) mate mate.static mate.dbg tags ffi/native.o \
+		tests/*.class Mate/*_stub.* \
 		jmate/lang/*.class jmate/io/*.class java/io/*.class \
 		java/lang/{Integer,Character,String,System}.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*