X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=05b96a16cd13f597ae30aea1f69a368b6b05b227;hb=7dc6971beb8a9c9fc36a7275d03abf1f1f7c25e5;hp=a130eff0418635f3709df1ad69eef0ec620f3bb6;hpb=e43bb104a7313dd696b8bb8aa3bafff94706a187;p=Rakka.git

diff --git a/Makefile b/Makefile
index a130eff..05b96a1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@ CABAL_FILE = Rakka.cabal
 GHC        = ghc
 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: build
@@ -11,8 +12,9 @@ run: build
 rebuild-index: build
 	$(EXECUTABLE) --rebuild-index
 
-.setup-config: $(CABAL_FILE) configure Setup Rakka.buildinfo.in
-	BUILD_TEST_SUITE=yes ./Setup configure
+dist/setup-config: $(CABAL_FILE) configure Setup Rakka.buildinfo.in
+	./Setup configure --disable-optimization -fbuild-test-suite
+#	./Setup configure -O
 
 configure: configure.ac
 	autoconf
@@ -21,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
@@ -33,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