Clean up the makefile and switch to ustar format.

diff --git a/makefile b/makefile
index 00368eaae80441a0e4698fa3eb474523b566972e..db0ec3363a675c660ffc12671d1ef9f7464b7a80 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,28 +1,43 @@
-BIN           = dist/build/halcyon/halcyon
-TESTSUITE_BIN = dist/build/testsuite/testsuite
+PN = halcyon
+BIN = dist/build/$(PN)/$(PN)
+SRCS := $(shell find src/ -type f -name '*.hs')
 
-.PHONY : dist doc test
+.PHONY : dist hlint
 
-$(BIN): src/*.hs src/Twitter/*.hs
-       runghc Setup.hs clean
-       runghc Setup.hs configure --user
+$(BIN): $(PN).cabal $(SRCS)
+       runghc Setup.hs configure --user --prefix=/
        runghc Setup.hs build
 
-$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
-       runghc Setup.hs configure --user --enable-tests
-       runghc Setup.hs build
+doc: $(PN).cabal $(SRCS)
+       runghc Setup.hs configure --user --prefix=/
+       runghc Setup.hs hscolour --all
+       runghc Setup.hs haddock --all    \
+                               --hyperlink-source \
+                                --haddock-options="--ignore-all-exports"
 
-clean:
-       runghc Setup.hs clean
+
+#
+# Testing.
+#
+
+TESTSUITE_BIN = dist/build/testsuite/testsuite
+TEST_SRCS := $(shell find test/ -type f -name '*.hs')
+
+$(TESTSUITE_BIN): $(PN).cabal $(SRCS) $(TEST_SRCS)
+       runghc Setup.hs configure --user --enable-tests --prefix=/
+       runghc Setup.hs build
 
 test: $(BIN) $(TESTSUITE_BIN)
        runghc Setup.hs test
 
-doc:
-       runghc Setup.hs hscolour --executables
-       runghc Setup.hs haddock --internal    \
-                               --executables \
-                               --hyperlink-source
+
+#
+# Misc.
+#
+
+dist:
+       runghc Setup.hs configure --prefix=/
+       TAR_OPTIONS="--format=ustar" runghc Setup.hs sdist
 
 hlint:
        hlint --ignore="Use camelCase"     \
@@ -30,6 +45,8 @@ hlint:
              --color                      \
              src
 
-dist:
-       runghc Setup.hs configure
-       runghc Setup.hs sdist
+clean:
+       runghc Setup.hs clean
+       find ./ -name '*.prof' -delete
+       find ./ -name '*.o' -delete
+       find ./ -name '*.hi' -delete