X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=makefile;h=9a1337225a32b22b7e4f2fe014495b56271c2c45;hp=ec658b07233d557c7bc4e2297927025376f6c5c0;hb=7992822de9d00f1a4c19bc2ef86e9deefc23da52;hpb=b18c060e5cb708901eb29f1f27b25c467875a143

diff --git a/makefile b/makefile
index ec658b0..9a13372 100644
--- a/makefile
+++ b/makefile
@@ -2,20 +2,28 @@
 
 # There's onlt one '$' in the awk script, but we have to double-money
 # it for make.
-PN  := $(shell grep 'name:' *.cabal | awk '{ print $$2 }')
-BIN := dist/build/$(PN)/$(PN)
+PN   = $(shell grep 'name:' *.cabal | awk '{ print $$2 }')
+BIN  = dist/build/$(PN)/$(PN)
+TESTSUITE_BIN = dist/build/testsuite/testsuite
+SRCS = $(shell find src/ -name '*.hs')
 
-$(BIN): src/*.hs
+$(BIN): $(SRCS)
 	runghc Setup.hs clean
 	runghc Setup.hs configure --user --flags=${FLAGS}
 	runghc Setup.hs build
 
+$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
+	runghc Setup.hs configure --user --flags=${FLAGS} --enable-tests
+	runghc Setup.hs build
+
 clean:
 	runghc Setup.hs clean
 	rm -f dist/
 	rm -f *.prof
 	rm -rf .hpc
 
+install: $(BIN)
+	runghc Setup.hs install
 
 # Neither 'haddock' nor 'hscolour' seem to work properly.
 doc: src_html
@@ -24,8 +32,5 @@ doc: src_html
 				--executables \
 				--hyperlink-source
 
-dist/build/autogen: $(BIN)
-
-
-test: dist/build/autogen
-	runghc -i"src" -i"dist/build/autogen" test/TestSuite.hs
+test: $(BIN) $(TESTSUITE_BIN)
+	runghc Setup.hs test