OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include writeECLData.[ch]pp with the rest of the files.

Browse Source 
Removed all traces of the ert conditional.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-12-03 08:54:43 +01:00
parent 013c7dc162
commit eeed5ca337
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -133,6 +133,7 @@ opm/core/utility/parameters/tinyxml/tinystr.cpp \
opm/core/utility/parameters/tinyxml/tinyxml.cpp \ opm/core/utility/parameters/tinyxml/tinyxml.cpp \
opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp \ opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp \
opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp \ opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp \
opm/core/utility/writeECLData.cpp \
opm/core/utility/writeVtkData.cpp \ opm/core/utility/writeVtkData.cpp \
opm/core/vag_format/vag.cpp \ opm/core/vag_format/vag.cpp \
opm/core/wells/InjectionSpecification.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/ParameterXML.hpp \
opm/core/utility/parameters/tinyxml/tinystr.h \ opm/core/utility/parameters/tinyxml/tinystr.h \
opm/core/utility/parameters/tinyxml/tinyxml.h \ opm/core/utility/parameters/tinyxml/tinyxml.h \
opm/core/utility/writeECLData.hpp \
opm/core/utility/writeVtkData.hpp \ opm/core/utility/writeVtkData.hpp \
opm/core/vag_format/vag.hpp \ opm/core/vag_format/vag.hpp \
opm/core/well.h \ opm/core/well.h \
@ -300,16 +302,6 @@ opm/core/linalg/call_umfpack.h \
opm/core/linalg/LinearSolverUmfpack.hpp opm/core/linalg/LinearSolverUmfpack.hpp
endif 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 if DUNE_ISTL
lib_libopmcore_la_SOURCES += \ lib_libopmcore_la_SOURCES += \