src/{Cube,FunctionValues}.hs: add explicit Cardinal imports.

[spline3.git] / makefile

diff --git a/makefile b/makefile
index 2a70a3178d04681aa517945a993d5498d5ed56d8..3862b333e3dbf6fd4de745e560814c56554969bf 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,80 +1,70 @@
-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 := spline3
-
-.PHONY : test publish_doc doc src_html hlint
-
-$(BIN): src/*.hs
-       ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs
-
-all: $(BIN) test_src
-
-test_src: src/Tests/*.hs
-       ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs src/Tests/*.hs
-
-profile: src/*.hs
-       ghc -O2 $(GHC_WARNINGS) -prof -auto-all --make -o bin/$(BIN) src/*.hs
+PN = spline3
+BIN = dist/build/$(PN)/$(PN)
+SRCS := $(shell find src/ -type f -name '*.hs')
+
+BIN           = dist/build/spline3/spline3
+DOCTESTS_BIN  = dist/build/doctests/doctests
+TESTSUITE_BIN = dist/build/testsuite/testsuite
+
+.PHONY : test doc dist hlint
+
+$(BIN): $(PN).cabal $(SRCS)
+       runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --flags=${FLAGS}
+       runghc Setup.hs build
+
+$(DOCTESTS_BIN): $(SRCS) test/Doctests.hs
+       runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --flags=${FLAGS} \
+                        --enable-tests
+       runghc Setup.hs build
+
+$(TESTSUITE_BIN): $(SRCS) test/TestSuite.hs
+       runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --flags=${FLAGS} \
+                        --enable-tests
+       runghc Setup.hs build
+
+llvm: $(PN).cabal $(SRCS)
+       FLAGS="llvm" make
+
+profile: $(SRCS)
+       runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --enable-executable-profiling
+       runghc Setup.hs build
 
 clean:
-       rm -f bin/$(BIN)
-       rm -f src/*.hi
-       rm -f src/*.o
-       rm -f src/Tests/*.hi
-       rm -f src/Tests/*.o
+       runghc Setup.hs clean
+       rm -rf dist/
        rm -f *.prof
-       rm -rf doc/html/*
-
-test:
-       runghc -i"src" test/TestSuite.hs
-
-
-src_html:
-       util/hscolour_srcs
-
-
-DOCS := -i /usr/share/doc/ghc-*/html/libraries/base-*/base.haddock
-DOCS += -i /usr/share/doc/ghc-*/html/libraries/ghc-prim-*/ghc-prim.haddock
-DOCS += -i /usr/share/doc/ghc-*/html/libraries/haskell98-*/haskell98.haddock
-DOCS += -i /usr/share/doc/storable-complex-*/html/storable-complex.haddock
-DOCS += -i /usr/share/doc/quickcheck-*/html/QuickCheck.haddock
-DOCS += -i /usr/share/doc/hmatrix-*/html/hmatrix.haddock
-DOCS += -i /usr/share/doc/hunit-*/html/HUnit.haddock
-
+       rm -f .hpc
 
-HTMLS := /usr/share/doc/ghc-*/html/libraries/base-*/*.html
-HTMLS += /usr/share/doc/ghc-*/html/libraries/ghc-prim-*/*.html
-HTMLS += /usr/share/doc/ghc-*/html/libraries/haskell98-*/*.html
-HTMLS += /usr/share/doc/quickcheck-*/html/*.html
-HTMLS += /usr/share/doc/hunit-*/html/*.html
-HTMLS += /usr/share/doc/storable-complex-*/html/*.html
-HTMLS += /usr/share/doc/hmatrix-*/html/*.html
+test:  $(PN).cabal $(TESTSUITE_BIN) $(DOCTESTS_BIN) $(BIN)
+       runghc Setup.hs test
 
-HSCOLOUR_SRCS := /usr/share/doc/ghc-*/html/libraries/base-*/src/*
-HSCOLOUR_SRCS += /usr/share/doc/ghc-*/html/libraries/ghc-prim-*/src/*
-HSCOLOUR_SRCS += /usr/share/doc/ghc-*/html/libraries/haskell98-*/src/*
-HSCOLOUR_SRCS += /usr/share/doc/hmatrix-*/html/src/*
+dist:
+       runghc Setup.hs configure --prefix=/
+       TAR_OPTIONS="--format=ustar" runghc Setup.hs sdist
 
-doc: src_html
-       cp -n $(HTMLS) ./doc/html/
-       cp -n $(HSCOLOUR_SRCS) ./doc/html/src/
-       haddock $(DOCS) --html --use-unicode               \
-         --odir=doc/html/ --title="spline3"               \
-         --source-module="src/%{MODULE/.//}.html"         \
-         --source-entity="src/%{MODULE/.//}.html#%{NAME}" \
-         src/*.hs src/Tests/*.hs
+doc: dist/doc
 
-SSH_USER=root@michael.orlitzky.com
-PUBLIC_DOCDIR=/var/www/orlitzky.com/michael/public/spline3/
-publish_doc: doc
-       rsync -avz -e ssh $(SSH_USER):$(PUBLIC_DOCDIR) ./doc/html/ 
+dist/doc: $(PN).cabal $(SRCS)
+       runghc Setup.hs configure --user --prefix=/ --flags=${FLAGS}
+       runghc Setup.hs hscolour --all
+       runghc Setup.hs haddock --all \
+                                --hyperlink-source \
+                                --haddock-options="--ignore-all-exports"
 
 hlint:
        hlint --ignore="Use camelCase"     \
-             --ignore="Redundant bracket" \
-             --color                      \
-             src
+              --ignore="Redundant bracket" \
+              --color                     \
+              src