X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=7523e3ae20e44f16ec9657a7533f9dea605a41cd;hb=19480b63a1835c71b6fd8ecd23c6f0eb915043ae;hp=7bbd4672c3c2f31012b099f5fdb2d76f279ea8d3;hpb=c5d0d16488499cc4ac6378217d6ac071baeb458b;p=spline3.git

diff --git a/makefile b/makefile
index 7bbd467..7523e3a 100644
--- a/makefile
+++ b/makefile
@@ -4,21 +4,27 @@ 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
 
 BIN := spline3
+GHC_OPTS := $(GHC_WARNINGS) -odir /tmp -hidir /tmp --make -o bin/${BIN}
 
-.PHONY : test doc src_html
+
+.PHONY : test publish_doc doc src_html hlint
 
 $(BIN): src/*.hs
-	ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs
+	ghc -O2 $(GHC_OPTS) src/*.hs
 
 all: $(BIN) test_src
 
 test_src: src/Tests/*.hs
-	ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs src/Tests/*.hs
+	ghc -O2 $(GHC_OPTS) src/*.hs src/Tests/*.hs
 
 profile: src/*.hs
-	ghc -O2 $(GHC_WARNINGS) -prof -auto-all --make -o bin/$(BIN) src/*.hs
+	ghc -O2 $(GHC_OPTS) -prof -auto-all src/*.hs
 
 clean:
 	rm -f bin/$(BIN)
@@ -37,13 +43,44 @@ src_html:
 	util/hscolour_srcs
 
 
-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/hmatrix-0.10.0.1/html/hmatrix.haddock
+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
+
+
+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
+
+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/*
 
 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
+
+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)
+
+hlint:
+	hlint --ignore="Use camelCase"     \
+	      --ignore="Redundant bracket" \
+	      --color			   \
+	      src