Now compiles parameter testcase, removed extraneous imported makefiles.

opm/core/utility/parameters/Makefile.am

@@ -1,21 +0,0 @@
-# $Date$
-# $Revision$
-
-SUBDIRS = tinyxml . test
-
-paramdir = $(includedir)/opm/core/utility/parameters/param
-
-param_HEADERS = Parameter.hpp ParameterGroup.hpp ParameterGroup_impl.hpp \
-                ParameterMapItem.hpp ParameterRequirement.hpp \
-                ParameterStrings.hpp ParameterTools.hpp ParameterXML.hpp
-
-noinst_LTLIBRARIES = libparam.la
-
-libparam_la_SOURCES = Parameter.cpp ParameterGroup.cpp ParameterTools.cpp \
-                      ParameterXML.cpp
-
-libparam_la_CPPFLAGS = $(ALL_PKG_CPPFLAGS) $(BOOST_CPPFLAGS)
-libparam_la_LDFLAGS  = $(ALL_PKG_LDFLAGS) $(BOOST_LDFLAGS)
-libparam_la_LIBADD = tinyxml/libtinyxml.la  $(ALL_PKG_LIBS) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB)
-
-include $(top_srcdir)/am/global-rules

opm/core/utility/parameters/test/Makefile.am

@@ -1,14 +0,0 @@
-# $Date: 2009-12-08 15:21:36 +0100 (Tue, 08 Dec 2009) $
-# $Revision: 699 $
-
-check_PROGRAMS = param_test
-
-param_test_SOURCES = param_test.cpp
-param_test_CXXFLAGS = $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS)
-param_test_LDADD = $(DUNE_LDFLAGS) $(DUNEMPILDFLAGS) $(DUNEMPILIBS) $(BOOST_LDFLAGS) \
-                         $(DUNE_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) ../libparam.la
-
-TESTS = $(check_PROGRAMS)
-
-include $(top_srcdir)/am/global-rules
-

opm/core/utility/parameters/tinyxml/Makefile.am

@@ -1,10 +0,0 @@
-# $Date$
-# $Revision$
-
-SUBDIRS = 
-
-noinst_LTLIBRARIES = libtinyxml.la
-
-libtinyxml_la_SOURCES = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
-
-include $(top_srcdir)/am/global-rules

opm/core/utility/test/Makefile.am

@@ -1,29 +0,0 @@
-# $Date$
-# $Revision$
-
-check_PROGRAMS = sparsetable_test sparsevector_test monotcubicinterpolator_test
-noinst_PROGRAMS = unit_test
-
-sparsetable_test_SOURCES = sparsetable_test.cpp
-sparsetable_test_CXXFLAGS = $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS)
-sparsetable_test_LDADD = $(DUNE_LDFLAGS) $(DUNEMPILDFLAGS) $(BOOST_LDFLAGS) \
-                         $(DUNE_LIBS) $(DUNEMPILIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-sparsevector_test_SOURCES = sparsevector_test.cpp
-sparsevector_test_CXXFLAGS = $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS)
-sparsevector_test_LDADD = $(DUNE_LDFLAGS) $(DUNEMPILDFLAGS) $(BOOST_LDFLAGS) \
-                          $(DUNE_LIBS) $(DUNEMPILIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-monotcubicinterpolator_test_SOURCES = monotcubicinterpolator_test.cpp
-monotcubicinterpolator_test_CXXFLAGS = $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS)
-monotcubicinterpolator_test_LDADD = $(DUNE_LDFLAGS) $(DUNEMPILDFLAGS) \
-                                    $(DUNE_LIBS) $(DUNEMPILIBS) ../libcommon.la
-
-unit_test_SOURCES = unit_test.cpp
-unit_test_CXXFLAGS = $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS)
-unit_test_LDADD = $(DUNE_LDFLAGS) $(DUNEMPILDFLAGS) $(DUNE_LIBS) $(DUNEMPILIBS)
-
-TESTS = $(check_PROGRAMS)
-
-include $(top_srcdir)/am/global-rules
-

tests/Makefile.am

@@ -16,6 +16,7 @@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 
 noinst_PROGRAMS =				\
 monotcubicinterpolator_test                     \
+param_test                                      \
 sparsetable_test                                \
 sparsevector_test                               \
 unit_test                                       \
@@ -23,11 +24,12 @@ test_readvector					\
 test_sf2p
 
 monotcubicinterpolator_test_SOURCES = monotcubicinterpolator_test.cpp
-sparsetable_test_SOURCES = sparsetable_test.cpp
+param_test_SOURCES        = param_test.cpp
+sparsetable_test_SOURCES  = sparsetable_test.cpp
 sparsevector_test_SOURCES = sparsevector_test.cpp
-unit_test_SOURCES       = unit_test.cpp
-test_readvector_SOURCES = test_readvector.cpp
-test_sf2p_SOURCES       = test_sf2p.cpp
+unit_test_SOURCES         = unit_test.cpp
+test_readvector_SOURCES   = test_readvector.cpp
+test_sf2p_SOURCES         = test_sf2p.cpp
 
 if UMFPACK
 noinst_PROGRAMS += test_cfs_tpfa

tests/param_test.cpp

@@ -40,7 +40,7 @@
 #define BOOST_TEST_MODULE ParameterTest
 #include <boost/test/unit_test.hpp>
 
-#include "../ParameterGroup.hpp"
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <cstddef>
 #include <sstream>