X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=fdac2f8c868b711c1f8839b030d9ff18bb344998;hb=1edcaa0d2e4b5f04ceb10024debb3219ac037057;hp=82ddbdd7f223c4ed791640b5cbabf930559e7bd6;hpb=fd63474506b9b074c4f92335dcafea70c026a46f;p=spline3.git

diff --git a/makefile b/makefile
index 82ddbdd..fdac2f8 100644
--- a/makefile
+++ b/makefile
@@ -29,21 +29,16 @@ GHC_OPTS := $(OPTIMIZATIONS) \
 .PHONY : test publish_doc doc src_html hlint
 
 $(BIN): src/*.hs
-	ghc -fllvm $(GHC_OPTS) src/*.hs
+	ghc -optc-O3 -optc-march=native $(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 $(GHC_OPTS) src/*.hs src/Tests/*.hs
+llvm: src/*.hs
+	ghc -fllvm -optlo-O3 -optlc-O3 $(GHC_OPTS) src/*.hs
 
 profile: src/*.hs
-	ghc -fllvm $(GHC_OPTS) -prof -auto-all -caf-all src/*.hs
+	ghc  -optc-O3 -optc-march=native $(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
+profile-llvm: src/*.hs
+	ghc -fllvm $(GHC_OPTS) -prof -auto-all -caf-all src/*.hs
 
 clean:
 	rm -f bin/$(BIN)
@@ -63,10 +58,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
@@ -74,13 +70,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/
@@ -89,7 +88,7 @@ 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/