From eeed5ca33745c351d9c06355abf412129c878b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 3 Dec 2012 08:54:43 +0100 Subject: [PATCH] Include writeECLData.[ch]pp with the rest of the files. Removed all traces of the ert conditional. --- Makefile.am | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 20482f86..aa8a1fad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,6 +133,7 @@ opm/core/utility/parameters/tinyxml/tinystr.cpp \ opm/core/utility/parameters/tinyxml/tinyxml.cpp \ opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp \ opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp \ +opm/core/utility/writeECLData.cpp \ opm/core/utility/writeVtkData.cpp \ opm/core/vag_format/vag.cpp \ opm/core/wells/InjectionSpecification.cpp \ @@ -278,6 +279,7 @@ opm/core/utility/parameters/ParameterTools.hpp \ opm/core/utility/parameters/ParameterXML.hpp \ opm/core/utility/parameters/tinyxml/tinystr.h \ opm/core/utility/parameters/tinyxml/tinyxml.h \ +opm/core/utility/writeECLData.hpp \ opm/core/utility/writeVtkData.hpp \ opm/core/vag_format/vag.hpp \ opm/core/well.h \ @@ -300,16 +302,6 @@ opm/core/linalg/call_umfpack.h \ opm/core/linalg/LinearSolverUmfpack.hpp endif -# Removed conditional, since the file now can be compiled -# always (function throwing if no ERT). -# if HAVE_ERT -lib_libopmcore_la_SOURCES += \ -opm/core/utility/writeECLData.cpp - -nobase_include_HEADERS += \ -opm/core/utility/writeECLData.hpp -# endif - if DUNE_ISTL lib_libopmcore_la_SOURCES += \