Fix a few hlint suggestions.

[dead/halcyon.git] / makefile

diff --git a/makefile b/makefile
index 1c36e613b9738757f77047a6e97d982378c4f8c2..6ef9b5779c5e75b53be88d7d386e31bd16f88119 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,39 +1,32 @@
-GHC_WARNINGS := -Wall
-GHC_WARNINGS += -fwarn-hi-shadowing
-GHC_WARNINGS += -fwarn-missing-signatures
-GHC_WARNINGS += -fwarn-name-shadowing
-GHC_WARNINGS += -fwarn-orphans
-GHC_WARNINGS += -fwarn-type-defaults
-
-BIN=bin/twat
+BIN           = dist/build/twat/twat
+TESTSUITE_BIN = dist/build/testsuite/testsuite
 
 .PHONY : doc test
 
-all: $(BIN)
-
-$(BIN): src/Twitter/*.hs src/*.hs
-       ghc -O2 $(GHC_WARNINGS) --make -o $(BIN) src/Twitter/*.hs src/*.hs
+$(BIN): src/*.hs src/Twitter/*.hs
+       runghc Setup.hs clean
+       runghc Setup.hs configure --user
+       runghc Setup.hs build
 
-profile: src/Twitter/*.hs src/*.hs
-       ghc -O2 $(GHC_WARNINGS) -prof -auto-all --make -o $(BIN) src/Twitter/*.hs src/*.hs
+$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
+       runghc Setup.hs configure --user --enable-tests
+       runghc Setup.hs build
 
 clean:
-       rm -f $(BIN)
-       rm -f src/*.hi
-       rm -f src/Twitter/*.hi
-       rm -f src/*.o
-       rm -f src/Twitter/*.o
-       rm -f *.prof
+       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:
-       haddock -i /usr/share/doc/haxml-1.13.2/html/HaXml.haddock \
-               -i /usr/share/doc/ghc-6.8.2/libraries/base/base.haddock \
-               -i /usr/share/doc/curl-1.3.5/html/curl.haddock \
-               -i /usr/share/doc/regex-compat-0.71.0.1/html/regex-compat.haddock \
-               -i /usr/share/doc/ghc-6.8.2/libraries/process/process.haddock \
-               -h \
-               -o doc/ \
-               src/*.hs src/Twitter/*.hs
+       runghc Setup.hs hscolour --executables
+       runghc Setup.hs haddock --internal    \
+                               --executables \
+                               --hyperlink-source
+
+hlint:
+       hlint --ignore="Use camelCase"     \
+             --ignore="Redundant bracket" \
+             --color                      \
+             src