X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=spline3.cabal;h=2fc7b13f9162800d404466360838a8db3dd237c9;hb=25e5b7ede93ded8e1ed0fc81f4c3979ff500309d;hp=bf17664c8d4e3c55520367d31940ac8b266203e3;hpb=40332b68d1ee06566785e8ec4556a495b74513f2;p=spline3.git

diff --git a/spline3.cabal b/spline3.cabal
index bf17664..2fc7b13 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -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
 
@@ -71,6 +67,7 @@ executable spline3
     FunctionValues
     Grid
     Misc
+    Paths_spline3
     Point
     RealFunction
     ScaleFactor
@@ -95,19 +92,12 @@ executable spline3
     -rtsopts
     -threaded
 
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
+  ghc-options:
+    -O2
+    -optc-O3
+    -optc-march=native
 
   ghc-prof-options:
-    -prof
     -auto-all
     -caf-all
 
@@ -129,22 +119,33 @@ test-suite doctests
     -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
+  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,
@@ -167,16 +168,10 @@ test-suite testsuite
     -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
+  ghc-options:
+    -O2
+    -optc-O3
+    -optc-march=native
 
 
 source-repository head