Inline the polynomial function.

[spline3.git] / makefile

diff --git a/makefile b/makefile
index c230b4bdeea355d0a0e80e82af23cc78a411afa1..2bbe57668e1a0bb5f8a262d88b35853ac77b85e2 100644 (file)
--- a/makefile
+++ b/makefile
@@ -13,34 +13,36 @@ 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
 
-GHC_OPTS := $(OPTIMIZATIONS) \
-           $(GHC_WARNINGS)  \
-            -odir $(TMPDIR)  \
-            -hidir $(TMPDIR) \
-            --make           \
-            -rtsopts         \
-            -threaded        \
-            -o bin/${BIN}
+GHC_OPTS += $(OPTIMIZATIONS)
+GHC_OPTS += $(GHC_WARNINGS)
+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 -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
+llvm: src/*.hs
+       ghc -fllvm -optlo-O3 -optlc-O3 $(GHC_OPTS) src/*.hs
 
-all: $(BIN) test_src
+profile: src/*.hs
+       GHC_OPTS="-prof -auto-all -caf-all" make
 
-test_src: src/Tests/*.hs
-       ghc $(GHC_OPTS) src/*.hs src/Tests/*.hs
+profile-llvm: src/*.hs
+       GHC_OPTS="-fllvm -prof -auto-all -caf-all" make llvm
 
-profile: src/*.hs
-       ghc $(GHC_OPTS) -prof -auto-all src/*.hs
+hpc: src/*.hs
+       GHC_OPTS="-fhpc" make
 
 clean:
        rm -f bin/$(BIN)
@@ -60,10 +62,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
@@ -71,13 +74,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/
@@ -86,7 +92,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/