X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=82ddbdd7f223c4ed791640b5cbabf930559e7bd6;hb=62b333768c3f3f5380fefeb9c5d09276543d677c;hp=723eab3a9128b0f82eeca9390b60f70ec4aa6440;hpb=d945d9d4d01a1398190c010551774ba7be23d1b9;p=spline3.git

diff --git a/makefile b/makefile
index 723eab3..82ddbdd 100644
--- a/makefile
+++ b/makefile
@@ -1,31 +1,54 @@
+BIN := spline3
+TMPDIR := /tmp
+
 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
 
-BIN := spline3
+OPTIMIZATIONS := -O2
+OPTIMIZATIONS += -fexcess-precision
+OPTIMIZATIONS += -fno-spec-constr-count
 
-.PHONY : test doc src_html hlint
+GHC_OPTS := $(OPTIMIZATIONS) \
+	    $(GHC_WARNINGS)  \
+            -odir $(TMPDIR)  \
+            -hidir $(TMPDIR) \
+            --make           \
+            -rtsopts         \
+            -threaded        \
+            -o bin/${BIN}
+
+
+.PHONY : test publish_doc doc src_html hlint
 
 $(BIN): src/*.hs
-	ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs
+	ghc -fllvm $(GHC_OPTS) src/*.hs
+
+gcc: src/*.hs
+	ghc -optc-O2 -optc-march=native $(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 $(GHC_OPTS) src/*.hs src/Tests/*.hs
 
 profile: src/*.hs
-	ghc -O2 $(GHC_WARNINGS) -prof -auto-all --make -o bin/$(BIN) src/*.hs
+	ghc -fllvm $(GHC_OPTS) -prof -auto-all -caf-all src/*.hs
+
+profile-gcc: src/*.hs
+	ghc  -optc-O2 -optc-march=native $(GHC_OPTS) -prof -auto-all -caf-all src/*.hs
 
 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 $(TMPDIR)/*.hi
+	rm -f $(TMPDIR)/*.o
 	rm -f *.prof
 	rm -rf doc/html/*
 
@@ -37,19 +60,42 @@ 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/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
+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" \