X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=8bb305a19adcc4a1e9e99063f99d277d1a224bab;hb=d843e97aa04278677eaede4e50ef680af32867e7;hp=b64ac4535450423d228b58371e8f85eb9387e204;hpb=4e8a07033b0b0ea0961bffb3bab0b6fc9c21afba;p=Rakka.git

diff --git a/Makefile b/Makefile
index b64ac45..8bb305a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,23 @@
 CABAL_FILE = Rakka.cabal
 GHC        = ghc
-EXECUTABLE = sudo rakka -p 8989 -l DEBUG
+EXECUTABLE = sudo ./dist/build/rakka/rakka -p 8989 -l DEBUG
+#EXECUTABLE = sudo ./dist/build/rakka/rakka -p 8989 -l DEBUG +RTS -S -A60M -RTS
+#EXECUTABLE = sudo ./dist/build/rakka/rakka -p 8989 -l DEBUG +RTS -p -RTS
 
-build: .setup-config Setup
+build: dist/setup-config Setup
+	$(MAKE) -C js $@
 	./Setup build
 
-run: install
+run: build
 	$(EXECUTABLE)
 
-.setup-config: $(CABAL_FILE) configure Setup Rakka.buildinfo.in
-	BUILD_TEST_SUITE=yes ./Setup configure
+rebuild-index: build
+	$(EXECUTABLE) --rebuild-index
+
+dist/setup-config: $(CABAL_FILE) configure Setup Rakka.buildinfo.in
+	./Setup configure --disable-optimization -fbuild-test-suite
+#	./Setup configure -fhardest-optimization
+#	./Setup configure -fenable-profiling
 
 configure: configure.ac
 	autoconf
@@ -18,7 +26,8 @@ Setup: Setup.hs
 	$(GHC) --make Setup
 
 clean:
-	rm -rf dist Setup Setup.o Setup.hi .setup-config
+	$(MAKE) -C js $@
+	rm -rf dist Setup Setup.o Setup.hi
 	find . -name '*~' -exec rm -f {} \;
 
 install: build
@@ -30,4 +39,4 @@ test: build
 sdist: Setup
 	./Setup sdist
 
-.PHONY: build run clean install doc sdist
\ No newline at end of file
+.PHONY: build run clean install doc sdist