X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=5ae5bbbe6abf74f3b1fb3deac20581681660bc9b;hb=715be016934300f596a11e4fc5b8ca2ec42d6c34;hp=84c6d1d0f0f3ff0bd2d304cc710c7313eaf0db93;hpb=f216ea2169204c82fb4fdd5b6ce08ac7bb53a738;p=spline3.git

diff --git a/makefile b/makefile
index 84c6d1d..5ae5bbb 100644
--- a/makefile
+++ b/makefile
@@ -1,31 +1,56 @@
+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
-
-BIN := spline3
-
-.PHONY : test doc src_html hlint
+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
+
+REPA_INCLUDES := -ivendor/repa-head/repa/dist/build/
+REPA_INCLUDES += -ivendor/repa-head/repa-io/dist/build
+
+GHC_OPTS += $(OPTIMIZATIONS)
+GHC_OPTS += $(GHC_WARNINGS)
+GHC_OPTS += $(REPA_INCLUDES)
+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 src_html hlint
 
 $(BIN): src/*.hs
-	ghc -O2 $(GHC_WARNINGS) --make -o bin/${BIN} src/*.hs
+	ghc -optc-O3 -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
+llvm: src/*.hs
+	ghc -fllvm -optlo-O3 -optlc-O3 $(GHC_OPTS) src/*.hs
 
 profile: src/*.hs
-	ghc -O2 $(GHC_WARNINGS) -prof -auto-all --make -o bin/$(BIN) src/*.hs
+	GHC_OPTS="-prof -auto-all -caf-all" make
+
+profile-llvm: src/*.hs
+	GHC_OPTS="-fllvm -prof -auto-all -caf-all" make llvm
+
+hpc: src/*.hs
+	GHC_OPTS="-fhpc" 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 $(TMPDIR)/*.hi
+	rm -f $(TMPDIR)/*.o
 	rm -f *.prof
 	rm -rf doc/html/*
 
@@ -40,10 +65,11 @@ src_html:
 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
+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
 
 
 HTMLS := /usr/share/doc/ghc-*/html/libraries/base-*/*.html
@@ -51,13 +77,16 @@ 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
+HTMLS += /usr/share/doc/test-framework-*/html/*.html
+HTMLS += /usr/share/doc/vector-*/html/*.html
+HTMLS += /usr/share/doc/repa-*/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/*
+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
 
 doc: src_html
 	cp -n $(HTMLS) ./doc/html/
@@ -66,7 +95,12 @@ doc: src_html
 	  --odir=doc/html/ --title="spline3"               \
 	  --source-module="src/%{MODULE/.//}.html"         \
 	  --source-entity="src/%{MODULE/.//}.html#%{NAME}" \
-	  src/*.hs src/Tests/*.hs
+	  src/*.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"     \