X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=makefile;h=986de5c65e6fc0f1f92a71bf8353c8596516699c;hp=abe71a3acbc7416c4048fb75885472bda361fb60;hb=93577603f6df06e4627ca13a6f5fe412b28dc817;hpb=cf0e5470657c80d2e4db116b309e8ca35b4136ad

diff --git a/makefile b/makefile
index abe71a3..986de5c 100644
--- a/makefile
+++ b/makefile
@@ -1,17 +1,23 @@
-.PHONY : doc test
+BIN           = dist/build/twat/twat
+TESTSUITE_BIN = dist/build/testsuite/testsuite
 
-twat: src/*.hs src/Twitter/*.hs
+.PHONY : dist doc test
+
+$(BIN): src/*.hs src/Twitter/*.hs
 	runghc Setup.hs clean
 	runghc Setup.hs configure --user
 	runghc Setup.hs build
 
+$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
+	runghc Setup.hs configure --user --enable-tests
+	runghc Setup.hs build
+
 clean:
 	runghc Setup.hs clean
 
-test:
-	runghc -i"src" test/TestSuite.hs
+test: $(BIN) $(TESTSUITE_BIN)
+	runghc Setup.hs test
 
-# Neither 'haddock' nor 'hscolour' seem to work properly.
 doc:
 	runghc Setup.hs hscolour --executables
 	runghc Setup.hs haddock --internal    \
@@ -23,3 +29,7 @@ hlint:
 	      --ignore="Redundant bracket" \
 	      --color			   \
 	      src
+
+dist:
+	runghc Setup.hs configure
+	runghc Setup.hs sdist