X-Git-Url: http://gitweb.michael.orlitzky.com/?p=spline3.git;a=blobdiff_plain;f=makefile;h=850626fdc4261e8c46133b28d1c1fd3dd07baa50;hp=2bbe57668e1a0bb5f8a262d88b35853ac77b85e2;hb=0d037f5f0829d9ee7fcccc58570305623665f52e;hpb=2692991205554fa8f2eacdc3e938772ab560edf7

diff --git a/makefile b/makefile
index 2bbe576..850626f 100644
--- a/makefile
+++ b/makefile
@@ -1,103 +1,59 @@
-BIN := spline3
-TMPDIR := /tmp
+BIN           = dist/build/spline3/spline3
+DOCTESTS_BIN  = dist/build/doctests/doctests
+TESTSUITE_BIN = dist/build/testsuite/testsuite
 
-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
-GHC_WARNINGS += -fwarn-tabs
-GHC_WARNINGS += -fwarn-incomplete-record-updates
-GHC_WARNINGS += -fwarn-monomorphism-restriction
-GHC_WARNINGS += -fwarn-unused-do-bind
-
-OPTIMIZATIONS := -O2
-OPTIMIZATIONS += -funbox-strict-fields
-OPTIMIZATIONS += -fexcess-precision
-OPTIMIZATIONS += -fno-spec-constr-count
-
-GHC_OPTS += $(OPTIMIZATIONS)
-GHC_OPTS += $(GHC_WARNINGS)
-GHC_OPTS += -odir $(TMPDIR)
-GHC_OPTS += -hidir $(TMPDIR)
-GHC_OPTS += --make
-GHC_OPTS += -rtsopts
-GHC_OPTS += -threaded
-GHC_OPTS += -o bin/${BIN}
+.PHONY : test publish_doc doc dist hlint
 
+$(BIN): src/*.hs
+	runghc Setup.hs clean
+	runghc Setup.hs configure --user --flags=${FLAGS}
+	runghc Setup.hs build
 
-.PHONY : test publish_doc doc src_html hlint
+$(DOCTESTS_BIN): src/*.hs test/Doctests.hs
+	runghc Setup.hs configure --user --flags=${FLAGS} --enable-tests
+	runghc Setup.hs build
 
-$(BIN): src/*.hs
-	ghc -optc-O3 -optc-march=native $(GHC_OPTS) src/*.hs
+$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
+	runghc Setup.hs configure --user --flags=${FLAGS} --enable-tests
+	runghc Setup.hs build
 
 llvm: src/*.hs
-	ghc -fllvm -optlo-O3 -optlc-O3 $(GHC_OPTS) src/*.hs
+	FLAGS="llvm" make
 
 profile: src/*.hs
-	GHC_OPTS="-prof -auto-all -caf-all" make
-
-profile-llvm: src/*.hs
-	GHC_OPTS="-fllvm -prof -auto-all -caf-all" make llvm
+	runghc Setup.hs configure --user --enable-executable-profiling
+	runghc Setup.hs build
 
 hpc: src/*.hs
-	GHC_OPTS="-fhpc" make
+	FLAGS="hpc" make
 
 clean:
-	rm -f bin/$(BIN)
-	rm -f $(TMPDIR)/*.hi
-	rm -f $(TMPDIR)/*.o
+	runghc Setup.hs clean
+	rm -f 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/quickcheck-*/html/QuickCheck.haddock
-DOCS += -i /usr/share/doc/hunit-*/html/HUnit.haddock
-DOCS += -i /usr/share/doc/test-framework-*/html/test-framework.haddock
-DOCS += -i /usr/share/doc/repa-*/html/repa.haddock
-DOCS += -i /usr/share/doc/vector-*/html/vector.haddock
-
+	rm -rf .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/test-framework-*/html/*.html
-HTMLS += /usr/share/doc/vector-*/html/*.html
-HTMLS += /usr/share/doc/repa-*/html/*.html
+test: $(BIN) $(DOCTESTS_BIN) $(TESTSUITE_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/test-framework-*/html/src/*
-HSCOLOUR_SRCS += /usr/share/doc/vector-*/html/src/*
-HSCOLOUR_SRCS += /usr/share/doc/repa-*/html/src/*.html
+dist:
+	runghc Setup.hs configure
+	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
+# Neither 'haddock' nor 'hscolour' seem to work properly.
+doc: src/*.hs
+	runghc Setup.hs configure --user --flags=${FLAGS}
+	runghc Setup.hs hscolour --executables
+	runghc Setup.hs haddock --internal    \
+				--executables \
+				--hyperlink-source
 
 SSH_USER=root@michael.orlitzky.com
 PUBLIC_DOCDIR=/var/www/orlitzky.com/michael/public/spline3/
 publish_doc: doc
-	rsync -avz -e ssh ./doc/html/ $(SSH_USER):$(PUBLIC_DOCDIR)
+	rsync -avz -e ssh               \
+	./dist/doc/html/spline3/spline3 \
+	$(SSH_USER):$(PUBLIC_DOCDIR)
 
 hlint:
 	hlint --ignore="Use camelCase"     \