Clean up the makefile, and set the version to 0.2.0 since our deps changed.

diff --git a/hath.cabal b/hath.cabal
index 9f2d972dcdaefd217b10ecca5f97eb5c90143bc5..dfa55a28f510df6ffb8b18c5227d6ef7948b7ea2 100644 (file)
--- a/hath.cabal
+++ b/hath.cabal
@@ -1,5 +1,5 @@
 name:           hath
-version:        0.1.3
+version:        0.2.0
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:    Michael Orlitzky <michael@orlitzky.com>

diff --git a/makefile b/makefile
index 5d42778f0942b95ef9a0266ed324f43ba470eadb..7358589c16122ae52257e33e6da76497583be061 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,39 +1,47 @@
-BIN           = dist/build/hath/hath
-TESTSUITE_BIN = dist/build/testsuite/testsuite
+PN            = hath
+BIN           = dist/build/$(PN)/$(PN)
+SRCS          = $(shell find src/ -type f -name '*.hs')
 
-.PHONY : test dist hlint
 
-$(BIN): src/*.hs
-       runghc Setup.hs clean
+.PHONY : dist hlint
+
+$(BIN): $(PN).cabal $(SRCS)
        runghc Setup.hs configure --user
        runghc Setup.hs build
 
-profile: src/*.hs
-       runghc Setup.hs clean
-       runghc Setup.hs configure --user --enable-executable-profiling
-       runghc Setup.hs build
 
-doc: src/*.hs
-       runghc Setup.hs configure --user
-       runghc Setup.hs hscolour --executables
-       runghc Setup.hs haddock --internal    \
-                               --executables \
-                               --hyperlink-source
+doc: $(PN).cabal $(SRCS)
+       runghc Setup.hs hscolour --all
+       runghc Setup.hs haddock --all\
+                               --hyperlink-source \
+                                --haddock-options="--ignore-all-exports"
 
-clean:
-       runghc Setup.hs clean
 
+#
+# Tests
+#
+TESTSUITE_BIN = dist/build/testsuite/testsuite
+TEST_SRCS := $(shell find test/ -type f -name '*.hs')
 
-$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
-       runghc Setup.hs configure --user --enable-tests
+$(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
 
+
+#
+# Misc
+#
+
+clean:
+       runghc Setup.hs clean
+
 dist:
        runghc Setup.hs configure
-       runghc Setup.hs sdist
+       TAR_OPTIONS="--format=ustar" runghc Setup.hs sdist
 
 hlint:
        hlint --ignore="Use camelCase"     \