X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=15f2a758d1b783816b54fea31ccdc3a2a02ae53d;hb=6c0620002bd5c088ce55a514e9c9ccc19e1cfbf9;hp=723eab3a9128b0f82eeca9390b60f70ec4aa6440;hpb=d945d9d4d01a1398190c010551774ba7be23d1b9;p=spline3.git

diff --git a/makefile b/makefile
index 723eab3..15f2a75 100644
--- a/makefile
+++ b/makefile
@@ -1,57 +1,73 @@
-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
+PN = spline3
+BIN = dist/build/$(PN)/$(PN)
+SRCS := $(shell find src/ -type f -name '*.hs')
 
-BIN := spline3
+BIN           = dist/build/spline3/spline3
+DOCTESTS_BIN  = dist/build/doctests/doctests
+TESTSUITE_BIN = dist/build/testsuite/testsuite
 
-.PHONY : test doc src_html hlint
+.PHONY : test doc dist hlint
 
-$(BIN): src/*.hs
-	ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs
+$(BIN): $(PN).cabal $(SRCS)
+	runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --flags=${FLAGS}
+	runghc Setup.hs build
 
-all: $(BIN) test_src
+$(DOCTESTS_BIN): $(SRCS) test/Doctests.hs
+	runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --flags=${FLAGS} \
+                        --enable-tests
+	runghc Setup.hs build
 
-test_src: src/Tests/*.hs
-	ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs src/Tests/*.hs
+$(TESTSUITE_BIN): $(SRCS) test/TestSuite.hs
+	runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --flags=${FLAGS} \
+                        --enable-tests
+	runghc Setup.hs build
 
-profile: src/*.hs
-	ghc -O2 $(GHC_WARNINGS) -prof -auto-all --make -o bin/$(BIN) src/*.hs
+llvm: $(PN).cabal $(SRCS)
+	FLAGS="llvm" make
 
-clean:
-	rm -f bin/$(BIN)
-	rm -f src/*.hi
-	rm -f src/*.o
-	rm -f src/Tests/*.hi
-	rm -f src/Tests/*.o
-	rm -f *.prof
-	rm -rf doc/html/*
+profile: $(SRCS)
+	runghc Setup.hs configure \
+                        --user \
+                        --prefix=/ \
+                        --enable-executable-profiling
+	runghc Setup.hs build
 
-test:
-	runghc -i"src" test/TestSuite.hs
+hpc: $(PN).cabal $(SRCS)
+	FLAGS="hpc" make
 
+clean:
+	runghc Setup.hs clean
+	rm -rf dist/
+	rm -f *.prof
+	rm -f .hpc
 
-src_html:
-	util/hscolour_srcs
+test:  $(PN).cabal $(TESTSUITE_BIN) $(DOCTESTS_BIN) $(BIN)
+	runghc Setup.hs test
 
+dist:
+	runghc Setup.hs configure --prefix=/
+	TAR_OPTIONS="--format=ustar" runghc Setup.hs sdist
 
-DOCS := -i /usr/share/doc/ghc-6.12.3/html/libraries/base-4.2.0.2/base.haddock
-DOCS += -i /usr/share/doc/storable-complex-0.2.1/html/storable-complex.haddock
-DOCS += -i /usr/share/doc/quickcheck-2.1.0.3/html/QuickCheck.haddock
-DOCS += -i /usr/share/doc/hmatrix-0.11.0.4/html/hmatrix.haddock
-DOCS += -i /usr/share/doc/hunit-1.2.0.3/html/HUnit.haddock
+doc: dist/doc
 
-doc: src_html
-	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
+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