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

diff --git a/Makefile b/Makefile
index b64ac45..05b96a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,20 @@
 CABAL_FILE = Rakka.cabal
 GHC        = ghc
-EXECUTABLE = sudo rakka -p 8989 -l DEBUG
+EXECUTABLE = sudo ./dist/build/rakka/rakka -p 8989 -l DEBUG
 
-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 -O
 
 configure: configure.ac
 	autoconf
@@ -18,7 +23,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 +36,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