From 4498b4008c90e7cf521887ede5e8ee98c31cc3f1 Mon Sep 17 00:00:00 2001
From: pbrod <per.andreas.brodtkorb@gmail.com>
Date: Mon, 30 Nov 2015 00:48:48 +0100
Subject: [PATCH] Try to compile fortran extensions again

---
 .coveragerc |  4 ++--
 setup.py    | 44 ++++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index cee8f9a..1f4b7fe 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -3,8 +3,8 @@
 branch = True
 source = wafo
 omit = 
-   wafo/test/*
-   wafo/source/*
+   tests/*
+   source/*
 
 [report]
 # Regexes for lines to exclude from consideration
diff --git a/setup.py b/setup.py
index c268ba4..9c353b9 100644
--- a/setup.py
+++ b/setup.py
@@ -27,34 +27,34 @@ def setup_package_pyscaffold():
                                    'wafo/source/c_library/c_functions.c'])
     extensions.append(c_lib_ext)
 
-#    rind_ext = Extension('wafo.rindmod',
-#                         extra_objects=['wafo/source/rind2007/intmodule.f',
-#                                  'wafo/source/rind2007/jacobmod.f',
-#                                  'wafo/source/rind2007/swapmod.f',
-#                                  'wafo/source/rind2007/fimod.f',
-#                                  'wafo/source/rind2007/rindmod.f',
-#                                  'wafo/source/rind2007/rind71mod.f'],
-#                          sources=['wafo/source/rind2007/rind_interface.f'])
-#    extensions.append(rind_ext)
-#
-#    mreg_ext = Extension('wafo.cov2mod',
-#                         sources=['wafo/source/mreg/dsvdc.f',
-#                                  'wafo/source/mreg/mregmodule.f',
-#                                  'wafo/source/mreg/intfcmod.f',
-#                                  'wafo/source/mreg/cov2mmpdfreg_intfc.f'],
-#                         include_dirs=['wafo/source/rind2007'])
-#    extensions.append(mreg_ext)
+    rind_ext = Extension('wafo.rindmod',
+                         extra_objects=['wafo/source/rind2007/intmodule.f',
+                                  'wafo/source/rind2007/jacobmod.f',
+                                  'wafo/source/rind2007/swapmod.f',
+                                  'wafo/source/rind2007/fimod.f',
+                                  'wafo/source/rind2007/rindmod.f',
+                                  'wafo/source/rind2007/rind71mod.f'],
+                          sources=['wafo/source/rind2007/rind_interface.f'])
+    extensions.append(rind_ext)
+
+    mreg_ext = Extension('wafo.cov2mod',
+                         sources=['wafo/source/mreg/dsvdc.f',
+                                  'wafo/source/mreg/mregmodule.f',
+                                  'wafo/source/mreg/intfcmod.f',
+                                  'wafo/source/mreg/cov2mmpdfreg_intfc.f'],
+                         include_dirs=['wafo/source/rind2007'])
+    extensions.append(mreg_ext)
 
     mvn_ext = Extension('wafo.mvn',
                         sources=['wafo/source/mvn/mvn.pyf',
                                  'wafo/source/mvn/mvndst.f'])
     extensions.append(mvn_ext)
 
-#    mvnprd_ext = Extension('wafo.mvnprdmod',
-#                           sources=['wafo/source/mvnprd/mvnprd.f',
-#                                    'wafo/source/mvnprd/mvnprodcorrprb.f',
-#                                    'wafo/source/mvnprd/mvnprd_interface.f'])
-#    extensions.append(mvnprd_ext)
+    mvnprd_ext = Extension('wafo.mvnprdmod',
+                           sources=['wafo/source/mvnprd/mvnprd.f',
+                                    'wafo/source/mvnprd/mvnprodcorrprb.f',
+                                    'wafo/source/mvnprd/mvnprd_interface.f'])
+    extensions.append(mvnprd_ext)
 
 
     needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)