makefile,spline3.cabal: move ghc-options to the makefile.

[spline3.git] / spline3.cabal

diff --git a/spline3.cabal b/spline3.cabal
index 52028c46458405c354931c48864a099071199042..4ff6891609c1822f6631a33bc3e149852f313fe7 100644 (file)
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -1,5 +1,5 @@
 name:           spline3
-version:        0.0.2
+version:        1.0.0
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:    Michael Orlitzky <michael@orlitzky.com>
@@ -17,7 +17,7 @@ description:
   Stanford volume data archive at <http://graphics.stanford.edu/data/voldata/>.
   .
   For more information and examples, please see the project homepage at
-  <http://michael.orlitzky.com/code/spline3.php>.
+  <http://michael.orlitzky.com/code/spline3.xhtml>.
 
 build-type:     Simple
 extra-source-files:
@@ -31,10 +31,6 @@ extra-source-files:
   doc/results/3d/*.png
   util/view-mri-data.py
 
-flag LLVM
-  description: Build with LLVM
-  default:     False
-
 
 executable spline3
 
@@ -79,39 +75,6 @@ executable spline3
     Values
     Volumetric
 
-  ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
-    -funbox-strict-fields
-    -fexcess-precision
-    -fno-spec-constr-count
-    -rtsopts
-    -threaded
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
-
-  ghc-prof-options:
-    -prof
-    -auto-all
-    -caf-all
-
 
 test-suite doctests
   type: exitcode-stdio-1.0
@@ -122,30 +85,28 @@ test-suite doctests
     -- Additional test dependencies.
     doctest                     >= 0.9
 
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  ghc-options:
-    -rtsopts
-    -threaded
-    -funbox-strict-fields
-    -fexcess-precision
-    -fno-spec-constr-count
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
-
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
   main-is: TestSuite.hs
+
+  other-modules:
+    Assertions
+    Cardinal
+    Comparisons
+    Cube
+    Examples
+    Face
+    FunctionValues
+    Grid
+    Misc
+    Point
+    RealFunction
+    ScaleFactor
+    Tetrahedron
+    Values
+
   build-depends:
     base                        < 5,
     cmdargs                     >= 0.10,
@@ -160,25 +121,6 @@ test-suite testsuite
     tasty-hunit                 >= 0.8,
     tasty-quickcheck            >= 0.8.1
 
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  ghc-options:
-    -rtsopts
-    -threaded
-    -funbox-strict-fields
-    -fexcess-precision
-    -fno-spec-constr-count
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
-
 
 source-repository head
   type: git