globalmaphack: be more general (fmap, factoring, ...)

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index abd630f75f2ee64a194d76634ada378427b87588..837c67cc6160606dcb2bc7c10c621647987ee2ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,10 @@ PACKAGES_ := bytestring harpy hs-java plugins
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
 
-# use `cpphs'
-GHC_CPP := -cpp -pgmP cpphs -optP --cpp
+GHC_CPP := -DARCH_X86
 
-GHC_OPT  = -I. -O0 -Wall -fno-warn-unused-do-bind
+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)
@@ -54,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)
@@ -83,7 +88,8 @@ clean:
        rm -rf $(BUILD) mate mate.static mate.dbg ffi/native.o \
                tests/*.class Mate/*_stub.* \
                jmate/lang/*.class jmate/io/*.class java/io/*.class \
-               java/lang/{Integer,Character,String,System}.class
+               java/lang/{Integer,Character,String,System}.class \
+               scratch/*.class
 
 ghci: mate.static
        ghci -I. $(PACKAGES) -outputdir $(B_STATIC) Mate.hs $(GHC_CPP)
@@ -102,3 +108,8 @@ hlint:
        @# ignore error code from hlint
        -hlint Mate.hs Mate/
        @mv debug_tmp.h debug.h
+
+scratch: mate $(wildcard jmate/lang/*.java) scratch/GCTest.java
+       javac $(wildcard jmate/lang/*.java)
+       javac scratch/GCTest.java
+       ./mate scratch.GCTest