diff --git a/CMakeLists.txt b/CMakeLists.txt
index a78cf5de35764c3557e2e0d0101702c84c1674c5..d0fe7294f8590a23976be70323f19cce0d3c2966 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ include(DuneMacros)
dune_project()
add_subdirectory(cmake/modules)
-add_subdirectory(m4)
add_subdirectory(dune)
add_subdirectory(doc)
add_subdirectory(lib)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 3c2b8b0feeedaa7b792474c8eb49657360948946..0000000000000000000000000000000000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-# we need the module file to be able to build via dunecontrol
-EXTRA_DIST= CMakeLists.txt dune.module
-
-# don't follow the full GNU-standard
-# we need automake 1.9 or newer
-AUTOMAKE_OPTIONS = foreign 1.9
-
-SUBDIRS = cmake dune doc lib m4
-
-# use configured compiler for "make distcheck"
-# doxygen is difficult to convince to build in a special directory...
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common="$(DUNE_COMMON_ROOT)" CXX="$(CXX)" CC="$(CC)" --enable-parallel=@ENABLE_PARALLEL@ MPICC="$(MPICC)"
-
-include $(top_srcdir)/am/global-rules
-include $(top_srcdir)/am/top-rules
-
-# Distribute and install config.h.cmake
-configdir = $(datadir)/dune-istl
-dist_config_DATA = config.h.cmake
-
-include $(top_srcdir)/am/cmake-pkg-config
diff --git a/cmake/Makefile.am b/cmake/Makefile.am
deleted file mode 100644
index 3ec72afaec54560dbc7334ce64a2fd542a186b54..0000000000000000000000000000000000000000
--- a/cmake/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS= modules
-
-include $(top_srcdir)/am/global-rules
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
deleted file mode 100644
index efdafc35264683f72c9609bbef91af4403f7afaa..0000000000000000000000000000000000000000
--- a/cmake/modules/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-MODULES = AddARPACKPPFlags.cmake \
- AddSuperLUFlags.cmake \
- DuneIstlMacros.cmake \
- FindARPACK.cmake \
- FindARPACKPP.cmake \
- FindSuperLU.cmake
-
-modulesdir= $(datadir)/dune/cmake/modules
-dist_modules_DATA = ${MODULES}
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 044c1619ecb73ad4246a68ad23881cb67cf88c01..0000000000000000000000000000000000000000
--- a/configure.ac
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-DUNE_AC_INIT # gets module version from dune.module file
-AC_CONFIG_SRCDIR([dune/istl/istlexception.hh])
-AC_CONFIG_HEADERS([config.h])
-
-# check all dune-module stuff
-DUNE_CHECK_ALL
-
-# set up flags for the automated test system
-DUNE_AUTOBUILD_FLAGS
-
-# preset variable to path such that #include <dune/...> works
-AC_SUBST([AM_CPPFLAGS], '$(DUNE_CPPFLAGS) -I$(top_srcdir)')
-AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS) $(DUNE_LIBS)')
-
-# write output
-AC_CONFIG_FILES([Makefile
- cmake/Makefile
- cmake/modules/Makefile
- doc/doxygen/Makefile
- doc/doxygen/Doxyfile
- doc/Makefile
- dune/istl/eigenvalue/Makefile
- dune/istl/paamg/test/Makefile
- dune/istl/paamg/Makefile
- dune/istl/tutorial/Makefile
- dune/istl/test/Makefile
- dune/istl/Makefile
- dune/Makefile
- lib/Makefile
- m4/Makefile
- dune-istl.pc])
-AC_OUTPUT
-
-DUNE_SUMMARY_ALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index b540d8a5b949488983f1de9737b24d1db02a49ff..0000000000000000000000000000000000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS = doxygen
-
-TEXSOURCES = istl.tex istl.bib
-EPSFILES = blockstructure.eps
-if BUILD_DOCS
- DOCFILES = istl.pdf
- EXTRA_DIST = CMakeLists.txt $(DOCFILES)
- EXTRAINSTALL = $(DOCFILES)
-endif
-
-# setting like in dune-web
-BASEDIR=../..
-CURDIR=doc/istl
-
-# where to install the docs
-docdir=$(datadir)/doc/dune-istl
-
-include $(top_srcdir)/am/latex
-include $(top_srcdir)/am/webstuff
-include $(top_srcdir)/am/global-rules
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
deleted file mode 100644
index 57cd506a084516dc30253aac164ffa9774b45a20..0000000000000000000000000000000000000000
--- a/doc/doxygen/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# setting like in dune-web
-BASEDIR=../..
-CURDIR=doc/doxygen
-
-include $(top_srcdir)/am/doxygen
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/dune/Makefile.am b/dune/Makefile.am
deleted file mode 100644
index eb7b66ecf494206750436a84b061bf8940fe215d..0000000000000000000000000000000000000000
--- a/dune/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = istl
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/dune/istl/Makefile.am b/dune/istl/Makefile.am
deleted file mode 100644
index f5dfbdc345d01875e1db66765582c093fe6916e8..0000000000000000000000000000000000000000
--- a/dune/istl/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-SUBDIRS = . tutorial test paamg eigenvalue
-
-istldir = $(includedir)/dune/istl
-istl_HEADERS = basearray.hh \
- bcrsmatrix.hh \
- bdmatrix.hh \
- btdmatrix.hh \
- bvector.hh \
- colcompmatrix.hh \
- gsetc.hh \
- ilu.hh \
- ilusubdomainsolver.hh \
- io.hh \
- istlexception.hh \
- matrix.hh \
- matrixindexset.hh \
- matrixmarket.hh\
- matrixmatrix.hh \
- matrixredistribute.hh \
- matrixutils.hh \
- multitypeblockmatrix.hh \
- multitypeblockvector.hh \
- novlpschwarz.hh \
- operators.hh \
- overlappingschwarz.hh \
- owneroverlapcopy.hh \
- pardiso.hh \
- preconditioner.hh \
- preconditioners.hh \
- repartition.hh \
- scalarproducts.hh \
- scaledidmatrix.hh \
- schwarz.hh \
- solvercategory.hh \
- solver.hh \
- solvers.hh \
- solvertype.hh \
- superlu.hh \
- supermatrix.hh \
- vbvector.hh \
- umfpack.hh
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/dune/istl/eigenvalue/Makefile.am b/dune/istl/eigenvalue/Makefile.am
deleted file mode 100644
index 8f5e2a374e7dc4aabf1e03c6c0429c2b874565b0..0000000000000000000000000000000000000000
--- a/dune/istl/eigenvalue/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = #test
-
-eigenvaluedir = $(includedir)/dune/istl/eigenvalue
-eigenvalue_HEADERS = arpackpp.hh \
- poweriteration.hh
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/dune/istl/paamg/Makefile.am b/dune/istl/paamg/Makefile.am
deleted file mode 100644
index 7d14f5b0b0fde00a58f91afa77cc4b4130ce1f5e..0000000000000000000000000000000000000000
--- a/dune/istl/paamg/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-SUBDIRS = test
-
-paamgdir = $(includedir)/dune/istl/paamg
-paamg_HEADERS = aggregates.hh \
- amg.hh \
- combinedfunctor.hh \
- construction.hh \
- dependency.hh \
- fastamg.hh \
- fastamgsmoother.hh \
- galerkin.hh \
- globalaggregates.hh \
- graph.hh \
- graphcreator.hh \
- hierarchy.hh \
- indicescoarsener.hh \
- kamg.hh \
- parameters.hh \
- pinfo.hh \
- properties.hh \
- renumberer.hh \
- smoother.hh \
- transfer.hh \
- twolevelmethod.hh
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/dune/istl/paamg/test/Makefile.am b/dune/istl/paamg/test/Makefile.am
deleted file mode 100644
index 107d68e67113a733830b8717b6e60acd4845f6f6..0000000000000000000000000000000000000000
--- a/dune/istl/paamg/test/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-if MPI
- MPITESTS =
- TESTPROGS = galerkintest hierarchytest pamgtest transfertest pamg_comm_repart_test
-endif
-
-if UMFPACK
- UMFPACKAMG = umfpackamgtest umfpackfastamg
-endif
-
-if DUNE_PTHREAD
- PTHREADTESTS = pthreadamgtest pthreadfastamgtest pthreadtwoleveltest
-endif
-
-NORMALTESTS = amgtest fastamg graphtest kamgtest twolevelmethodschwarztest twolevelmethodtest $(MPITESTS) $(UMFPACKAMG)
-
-# which tests to run
-TESTS = $(NORMALTESTS) $(TESTPROGS) $(PTHREADTESTS)
-
-# programs just to build when "make check" is used
-check_PROGRAMS = $(TESTPROGS) $(NORMALTESTS) $(PTHREADTESTS)
-
-# define the programs
-
-graphtest_SOURCES = graphtest.cc
-
-transfertest_SOURCES = transfertest.cc
-transfertest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS)
-transfertest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS)
-transfertest_LDADD = \
- $(DUNEMPILIBS) \
- $(LDADD)
-
-galerkintest_SOURCES = galerkintest.cc anisotropic.hh
-galerkintest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS)
-galerkintest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS)
-galerkintest_LDADD = \
- $(DUNEMPILIBS) \
- $(LDADD)
-
-hierarchytest_SOURCES = hierarchytest.cc anisotropic.hh
-hierarchytest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS)
-hierarchytest_LDADD = \
- $(DUNEMPILIBS) \
- $(LDADD)
-hierarchytest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS)
-
-amgtest_SOURCES = amgtest.cc
-amgtest_CPPFLAGS = $(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS)
-amgtest_LDFLAGS = $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-amgtest_LDADD = \
- $(SUPERLU_LIBS) \
- $(LDADD)
-
-umfpackamgtest_SOURCES = amgtest.cc
-umfpackamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(UMFPACK_CPPFLAGS)
-umfpackamgtest_LDFLAGS = $(AM_LDFLAGS) $(UMFPACK_LDFLAGS)
-umfpackamgtest_LDADD = $(UMFPACK_LIBS)
-
-fastamg_SOURCES = fastamg.cc
-fastamg_CPPFLAGS = $(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS)
-fastamg_LDFLAGS = $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-fastamg_LDADD = \
- $(SUPERLU_LIBS) \
- $(LDADD)
-
-umfpackfastamg_SOURCES = fastamg.cc
-umfpackfastamg_CPPFLAGS = $(AM_CPPFLAGS) $(UMFPACK_CPPFLAGS)
-umfpackfastamg_LDFLAGS = $(AM_LDFLAGS) $(UMFPACK_LDFLAGS)
-umfpackfastamg_LDADD = $(UMFPACK_LIBS)
-
-kamgtest_SOURCES = kamgtest.cc
-kamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS)
-kamgtest_LDFLAGS = $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-kamgtest_LDADD = \
- $(SUPERLU_LIBS) \
- $(LDADD)
-
-pamgtest_SOURCES = parallelamgtest.cc
-pamgtest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS) \
- $(SUPERLU_CPPFLAGS) \
- $(PARMETIS_CPPFLAGS)
-pamgtest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS) \
- $(PARMETIS_LDFLAGS)
-pamgtest_LDADD = \
- $(PARMETIS_LIBS) \
- $(SUPERLU_LIBS) \
- $(DUNEMPILIBS) \
- $(LDADD)
-
-pamg_comm_repart_test_SOURCES = parallelamgtest.cc
-pamg_comm_repart_test_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS) \
- $(SUPERLU_CPPFLAGS) \
- $(PARMETIS_CPPFLAGS) -DAMG_REPART_ON_COMM_GRAPH
-pamg_comm_repart_test_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS) \
- $(PARMETIS_LDFLAGS)
-pamg_comm_repart_test_LDADD = \
- $(PARMETIS_LIBS) \
- $(SUPERLU_LIBS) \
- $(DUNEMPILIBS) \
- $(LDADD)
-
-twolevelmethodschwarztest_SOURCES = twolevelmethodtest.cc
-twolevelmethodschwarztest_CPPFLAGS = $(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS) -DUSE_OVERLAPPINGSCHWARZ
-twolevelmethodschwarztest_LDFLAGS = $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-twolevelmethodschwarztest_LDADD = \
- $(SUPERLU_LIBS) \
- $(LDADD)
-
-twolevelmethodtest_SOURCES = twolevelmethodtest.cc
-twolevelmethodtest_CPPFLAGS = $(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS)
-twolevelmethodtest_LDFLAGS = $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-twolevelmethodtest_LDADD = \
- $(SUPERLU_LIBS) \
- $(LDADD)
-
-pthreadamgtest_SOURCES = pthreadamgtest.cc
-pthreadamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) -DMYAMG="Dune::Amg::AMG<Operator,Vector,Smoother>"
-pthreadamgtest_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS)
-pthreadamgtest_LDADD = $(PTHREAD_LIBS) $(LDADD)
-
-pthreadfastamgtest_SOURCES = pthreadamgtest.cc
-pthreadfastamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) -DMYAMG="Dune::Amg::FastAMG<Operator,Vector>"
-pthreadfastamgtest_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS)
-pthreadfastamgtest_LDADD = $(PTHREAD_LIBS) $(LDADD)
-
-pthreadtwoleveltest_SOURCES = pthreadtwoleveltest.cc
-pthreadtwoleveltest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS)
-pthreadtwoleveltest_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS)
-pthreadtwoleveltest_LDADD = $(PTHREAD_LIBS) $(LDADD)
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/dune/istl/test/Makefile.am b/dune/istl/test/Makefile.am
deleted file mode 100644
index de26c2cfde6637ff1c0a18b7a241da24e0947dea..0000000000000000000000000000000000000000
--- a/dune/istl/test/Makefile.am
+++ /dev/null
@@ -1,181 +0,0 @@
-if MPI
- MPITESTS = vectorcommtest matrixmarkettest
-endif
-
-if MPI
- PARMETISTESTS= matrixredisttest
-endif
-
-if SUPERLU
- SUPERLUTESTS = superlutest superluztest superluctest superlustest
-endif
-
-if PARDISO
- PARDISOTEST = test_pardiso
-endif
-
-if UMFPACK
- UMFPACKTEST = umfpacktest
-endif
-
-# which tests where program to build and run are equal
-NORMALTESTS = basearraytest \
- bcrsassigntest \
- bcrsbuildtest \
- bcrsimplicitbuildtest \
- bvectortest \
- complexmatrixtest \
- complexrhstest \
- dotproducttest \
- iotest \
- inverseoperator2prectest \
- matrixiteratortest \
- matrixtest \
- matrixutilstest \
- mmtest \
- mv \
- overlappingschwarztest \
- scaledidmatrixtest \
- seqmatrixmarkettest \
- solvertest \
- vbvectortest
-
-# list of tests to run (indicestest is special case)
-TESTS = $(NORMALTESTS) $(MPITESTS) $(SUPERLUTESTS) $(PARDISOTEST) $(PARMETISTESTS) $(UMFPACKTEST)
-
-# programs just to build when "make check" is used
-check_PROGRAMS = $(NORMALTESTS) $(MPITESTS) $(SUPERLUTESTS) $(PARDISOTEST) $(PARMETISTESTS) $(UMFPACKTEST)
-
-# define the programs
-
-overlappingschwarztest_SOURCES = overlappingschwarztest.cc
-overlappingschwarztest_LDADD =
-overlappingschwarztest_LDFLAGS= $(AM_LDFLAGS)
-overlappingschwarztest_CPPFLAGS= $(AM_CPPFLAGS)
-
-if SUPERLU
- superlutest_SOURCES = superlutest.cc
- superlutest_LDADD= $(SUPERLU_LIBS)
- superlutest_LDFLAGS= $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
- superlutest_CPPFLAGS=$(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS)
-
- superlustest_SOURCES = superlutest.cc
- superlustest_LDADD= $(SUPERLU_LIBS)
- superlustest_LDFLAGS= $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
- superlustest_CPPFLAGS=$(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS) -DSUPERLU_NTYPE=0
-
-
- superluctest_SOURCES = superlutest.cc
- superluctest_LDADD= $(SUPERLU_LIBS)
- superluctest_LDFLAGS= $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
- superluctest_CPPFLAGS=$(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS) -DSUPERLU_NTYPE=2
-
-
- superluztest_SOURCES = superlutest.cc
- superluztest_LDADD= $(SUPERLU_LIBS)
- superluztest_LDFLAGS= $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
- superluztest_CPPFLAGS=$(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS) -DSUPERLU_NTYPE=3
-
- overlappingschwarztest_LDADD += $(SUPERLU_LIBS)
- overlappingschwarztest_LDFLAGS += $(SUPERLU_LDFLAGS)
- overlappingschwarztest_CPPFLAGS += $(SUPERLU_CPPFLAGS)
-endif
-
-if UMFPACK
- umfpacktest_SOURCES= umfpacktest.cc
- umfpacktest_LDADD= $(UMFPACK_LIBS)
- umfpacktest_LDFLAGS= $(AM_LDFLAGS) $(UMFPACK_LDFLAGS)
- umfpacktest_CPPFLAGS= $(AM_CPPFLAGS) $(UMFPACK_CPPFLAGS)
-
- overlappingschwarztest_LDADD += $(UMFPACK_LIBS)
- overlappingschwarztest_LDFLAGS += $(UMFPACK_LDFLAGS)
- overlappingschwarztest_CPPFLAGS += $(UMFPACK_CPPFLAGS)
-endif
-
-if PARDISO
- test_pardiso_SOURCES = test_pardiso.cc
- test_pardiso_LDADD = $(PARDISO_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
-endif
-
-basearraytest_SOURCES = basearraytest.cc
-
-bcrsassigntest_SOURCES = bcrsassigntest.cc
-
-bcrsbuildtest_SOURCES = bcrsbuild.cc
-
-bcrsimplicitbuildtest_SOURCES = bcrsimplicitbuild.cc
-bcrsimplicitbuildtest_CPPFLAGS = $(AM_CPPFLAGS) -DDUNE_ISTL_WITH_CHECKING=1
-
-bvectortest_SOURCES = bvectortest.cc
-
-complexmatrixtest_SOURCES = complexmatrixtest.cc complexdata.hh
-
-complexrhstest_SOURCES = complexrhstest.cc laplacian.hh
-complexrhstest_LDADD= $(SUPERLU_LIBS)
-complexrhstest_LDFLAGS= $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-complexrhstest_CPPFLAGS=$(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS) -DSUPERLU_NTYPE=3
-
-dotproducttest_SOURCES = dotproducttest.cc
-
-vbvectortest_SOURCES = vbvectortest.cc
-
-matrixutilstest_SOURCES = matrixutilstest.cc laplacian.hh
-
-matrixiteratortest_SOURCES = matrixiteratortest.cc
-
-matrixtest_SOURCES = matrixtest.cc
-
-mmtest_SOURCES = mmtest.cc
-
-mv_SOURCES = mv.cc
-
-iotest_SOURCES = iotest.cc
-
-inverseoperator2prectest_SOURCES = inverseoperator2prectest.cc
-
-scaledidmatrixtest_SOURCES = scaledidmatrixtest.cc
-
-solvertest_SOURCES = solvertest.cc
-
-if MPI
- vectorcommtest_SOURCES = vectorcommtest.cc
- vectorcommtest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS)
- vectorcommtest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS)
- vectorcommtest_LDADD = \
- $(DUNEMPILIBS) \
- $(LDADD)
- matrixmarkettest_SOURCES = matrixmarkettest.cc
- matrixmarkettest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS)
- matrixmarkettest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS)
- matrixmarkettest_LDADD = \
- $(DUNEMPILIBS) \
- $(LDADD)
-endif
-
-seqmatrixmarkettest_SOURCES = matrixmarkettest.cc
-
-if MPI
- matrixredisttest_SOURCES = matrixredisttest.cc
- matrixredisttest_CPPFLAGS = $(AM_CPPFLAGS) \
- $(DUNEMPICPPFLAGS) \
- ${PARMETIS_CPPFLAGS}
- matrixredisttest_LDFLAGS = $(AM_LDFLAGS) \
- $(DUNEMPILDFLAGS) \
- ${PARMETIS_LDFLAGS}
- matrixredisttest_LDADD = \
- ${PARMETIS_LDFLAGS} ${PARMETIS_LIBS} \
- ${DUNEMPILIBS} \
- $(LDADD)
-endif
-
-headercheck_IGNORE = complexdata.hh
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
-
-CLEANFILES = umfpack_decomp
diff --git a/dune/istl/tutorial/Makefile.am b/dune/istl/tutorial/Makefile.am
deleted file mode 100644
index 2cacdf66c2a9b7c057e9066a017d0992206e1c2c..0000000000000000000000000000000000000000
--- a/dune/istl/tutorial/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-dist_noinst_DATA = example.cc
-
-noinst_PROGRAMS = example
-example_SOURCES = example.cc
-example_CPPFLAGS = $(AM_CPPFLAGS) $(DUNE_CPPFLAGS)
-
-include $(top_srcdir)/am/global-rules
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index fa6fbc34752e0e3d4f7c0b14a9fe7bbf0212c559..0000000000000000000000000000000000000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-dunemodulelibdir=$(libdir)
-
-EXTRA_DIST = CMakeLists.txt duneistlam2cmake.lib
-dunemodulelib_DATA = duneistlam2cmake.lib
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
deleted file mode 100644
index 562b6debd16eecead5e98a709b907de61175bbd7..0000000000000000000000000000000000000000
--- a/m4/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-install(PROGRAMS
- dune_istl.m4 pardiso.m4 superlu-dist.m4 superlu.m4
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/aclocal)
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index fe5e4a77e5e7686d567e19df21039dd591d0a460..0000000000000000000000000000000000000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-ALLM4S = \
- dune_istl.m4 \
- pardiso.m4 \
- superlu-dist.m4 \
- superlu.m4
-
-aclocaldir = $(datadir)/dune/aclocal
-aclocal_DATA = $(ALLM4S)
-
-EXTRA_DIST = CMakeLists.txt $(ALLM4S)
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/pardiso.m4 b/m4/pardiso.m4
deleted file mode 100644
index 5cd43a379dfba62384d26ca8266eb50854953340..0000000000000000000000000000000000000000
--- a/m4/pardiso.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-AC_DEFUN([DUNE_PARDISO], [
-AC_PREREQ(2.50)
-AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-AC_REQUIRE([ACX_LAPACK])
-acx_pardiso_ok=no
-
-AC_ARG_WITH(pardiso,
- [AC_HELP_STRING([--with-pardiso=<lib>], [use PARDISO library <lib>])])
-case $with_pardiso in
- yes | "") ;;
- no) acx_pardiso_ok=disable ;;
- -* | */* | *.a | *.so | *.so.* | *.o) PARDISO_LIBS="$with_pardiso" ;;
- *) PARDISO_LIBS="-l$with_pardiso" ;;
-esac
-# Get fortran linker names of PARDISO functions to check for.
-AC_F77_FUNC(pardisoinit)
-acx_pardiso_save_LIBS="$LIBS"
-LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
-
-# First, check PARDISO_LIBS environment variable
-if test $acx_pardiso_ok = no; then
-if test "x$PARDISO_LIBS" != x; then
- save_LIBS="$LIBS"; LIBS="$PARDISO_LIBS $LIBS"
- AC_MSG_CHECKING([for $pardisoinit in $PARDISO_LIBS])
- AC_LINK_IFELSE(
- [AC_LANG_CALL([], $pardisoinit)],
- [dnl
- # add to global list
- DUNE_PKG_LIBS="$DUNE_PKG_LIBS $PARDISO_LIBS $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
- acx_pardiso_ok=yes],
- [PARDISO_LIBS=""])
- AC_MSG_RESULT($acx_pardiso_ok)
- LIBS="$save_LIBS"
-fi
-fi
-
-# tell automake
-AM_CONDITIONAL(PARDISO, test $acx_pardiso_ok = yes)
-
-AC_SUBST(PARDISO_LIBS)
-
-LIBS="$acx_pardiso_save_LIBS"
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pardiso_ok" = xyes; then
- ifelse([$1],,AC_DEFINE(HAVE_PARDISO,1,[Define if you have a
-PARDISO library.]),[$1])
- :
-else
- acx_pardiso_ok=no
- $2
-fi
-])dnl SET_PARDISO
-
diff --git a/m4/superlu-dist.m4 b/m4/superlu-dist.m4
deleted file mode 100644
index 1841c9b868f3efceebd43e31cba27c8e87332c59..0000000000000000000000000000000000000000
--- a/m4/superlu-dist.m4
+++ /dev/null
@@ -1,202 +0,0 @@
-# searches for Superlu_Dist headers and libs
-AC_DEFUN([_slu_dist_lib_path],
- [
- my_include_path=include/superludist
- my_lib_path=lib
- my_slu_found=yes
- if test ! -f "$1/$my_include_path/$2" ; then
- #Try to find headers under superlu
- my_include_path=include
- if test ! -f "$with_superlu_dist/$my_include_path/$2" ; then
- my_include_path=SRC
- my_lib_path=""
- if test ! -f "$with_superlu_dist/$my_include_path/$2"; then
- my_slu_found=no
- fi
- fi
- fi
- ]
-)
-
-#AC_DEFUN([_slu_dist_search_versions],
-# [
-# my_slu_header=slu_ddefs.h
-# _slu_dist_lib_path($1, "$my_slu_header")
-# if test "$my_slu_found" != "yes"; then
-# my_slu_header="dsp_defs.h"
-# _slu_dist_lib_path($1, "$my_slu_header")
-# fi
-# ]
-#)
-
-AC_DEFUN([_slu_dist_search_default],
- [
- with_superlu_dist=/usr
- _slu_dist_lib_path($with_superlu_dist, "superlu_ddefs.h")
-
- if test "$my_slu_found" = "no"; then
- with_superlu_dist=/usr/local
- _slu_dist_lib_path($with_superlu_dist, "superlu_ddefs.h")
- fi
- ]
-)
-
-AC_DEFUN([DUNE_PATH_SUPERLU_DIST],[
- AC_MSG_CHECKING(for SuperLUDist library)
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([ACX_BLAS])
- AC_REQUIRE([DUNE_MPI])
-
- #
- # USer hints ...
- #
- my_lib_path=""
- my_include_path=""
- AC_ARG_WITH([superlu_dist],
- [AC_HELP_STRING([--with-superlu-dist],[user defined path to SuperLUDist library])],
- [dnl
- if test "$withval" != no ; then
- if test "$withval" = yes; then
- # Search in default locations
- _slu_dist_search_default
- else
- # get absolute path
- with_superlu_dist=`eval cd $withval 2>&1 && pwd`
- # Search for the headers in the specified location
- _slu_dist_lib_path("$with_superlu_dist", "superlu_ddefs.h")
- fi
- fi
- ],
- [dnl
- # Search in default locations
- _slu_dist_search_default
- ])
- AC_MSG_RESULT([$with_superlu_dist/$my_include_path])
- AC_ARG_WITH([super_lu_dist_lib],
- [AC_HELP_STRING([--with-superlu-dist-lib],[The name of the static SuperLUDist library to link to. By default the shared library with the name superlu-mpi is tried])],
- [
- if test "$withval" != no ; then
- with_superlu_dist_lib=$withval
- fi
- ]
- )
-
- # store old values
- ac_save_LDFLAGS="$LDFLAGS"
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_LIBS="$LIBS"
-
- ## do nothing if --without-superlu_dist is used
- if test x"$with_superlu_dist" != x"no" ; then
-
- # defaultpath
- SUPERLU_DIST_LIB_PATH="$with_superlu_dist/$my_lib_path"
- SUPERLU_DIST_INCLUDE_PATH="$with_superlu_dist/$my_include_path"
-
- SUPERLU_DIST_LDFLAGS="-L$SUPERLU_DIST_LIB_PATH $DUNEMPILDFLAGS"
-
- # set variables so that tests can use them
- CPPFLAGS="$CPPFLAGS -I$SUPERLU_DIST_INCLUDE_PATH $DUNEMPICPPFLAGS"
-
- # check for central header
- AC_CHECK_HEADER([superlu_ddefs.h],[
- SUPERLU_DIST_CPPFLAGS="$CPPFLAGS"
- HAVE_SUPERLU_DIST="1"],[
- HAVE_SUPERLU_DIST="0"
- AC_MSG_WARN([superlu_ddefs.h not found in $SUPERLU_DIST_INCLUDE_PATH with $CPPFLAGS])]
- )
-
- SUPERLU_DIST_CPPFLAGS="-I$SUPERLU_DIST_INCLUDE_PATH $DUNEMPICPPFLAGS"
-
- # if header is found check for the libs
-
- if test x$HAVE_SUPERLU_DIST = x1 ; then
-
- # set variables so that tests can use them
- OLDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$SUPERLU_DIST_LIB_PATH $DUNEMPILDFLAGS"
- LIBS="$BLAS_LIBS $LIBS $FLIBS $DUNEMPILIBS"
-
- AC_CHECK_LIB(superlu-mpi, [pdgssvx],
- [dnl
- SUPERLU_DIST_LIBS="-lsuperlu-mpi $LIBS"
- SUPERLU_DIST_LDFLAGS="$LDFLAGS"
- HAVE_SUPERLU_DIST="1"
- AC_MSG_RESULT(yes)
- ],[dnl
- HAVE_SUPERLU_DIST="0"
- AC_MSG_WARN(libsuperlu-mpi not found)])
-
- if test "$HAVE_SUPERLU_DIST" = 0; then
- #check for the static library
- if test x$with_superlu_dist_lib = x ; then
- with_superlu_dist_lib=superlu_mpi.a
- fi
- AC_MSG_CHECKING([static SuperLUDist library $with_superlu_dist_lib in "$SUPERLU_DIST_LIB_PATH"])
-
- if test -f "$SUPERLU_DIST_LIB_PATH/$with_superlu_dist_lib"; then
- LIBS="$SUPERLU_DIST_LIB_PATH/$with_superlu_dist_lib $LIBS"
- LDFLAGS="$OLDFLAGS"
- AC_CHECK_FUNC(pdgssvx,
- [
- SUPERLU_DIST_LIBS="$LIBS"
- SUPERLU_DIST_LDFLAGS="$LDFLAGS"
- HAVE_SUPERLU_DIST="1"
- AC_MSG_RESULT(yes)
- ],
- [
- HAVE_SUPERLU_DIST="0"
- AC_MSG_RESULT(failed)
- ]
- )
- else
- AC_MSG_RESULT(failed)
- HAVE_SUPERLU_DIST="0"
- fi
- fi
- fi
- # pre-set variable for summary
- #with_superlu_dist="no"
-
- # did it work?
- AC_MSG_CHECKING([SuperLUDist in $with_superlu_dist])
- if test x$HAVE_SUPERLU_DIST = x1 ; then
- AC_SUBST(SUPERLU_DIST_LDFLAGS, $SUPERLU_DIST_LDFLAGS)
- AC_SUBST(SUPERLU_DIST_LIBS, $SUPERLU_DIST_LIBS)
- AC_SUBST(SUPERLU_DIST_CPPFLAGS, $SUPERLU_DIST_CPPFLAGS)
- AC_DEFINE(HAVE_SUPERLU_DIST, 1, [Define to 1 if SUPERLU_DIST is found])
- AC_MSG_RESULT(ok)
-
- # add to global list
- DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $SUPERLU_DIST_LDFLAGS"
- DUNE_PKG_LIBS="$DUNE_PKG_LIBS $SUPERLU_DIST_LIBS"
- DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $SUPERLU_DIST_CPPFLAGS"
-
- # re-set variable correctly
- with_superlu_dist="yes"
- else
- with_superlu_dist="no"
- AC_MSG_RESULT(failed)
- fi
-
- # end of "no --without-superlu_dist"
- else
- with_superlu_dist="no"
- fi
-
- # tell automake
- AM_CONDITIONAL(SUPERLU_DIST, test x$HAVE_SUPERLU_DIST = x1)
-
- # restore variables
- LDFLAGS="$ac_save_LDFLAGS"
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIBS="$ac_save_LIBS"
-
- DUNE_ADD_SUMMARY_ENTRY([SuperLU-DIST],[$with_superlu_dist])
-
- ]
-)
-
-dnl Local Variables:
-dnl mode: shell-script
-dnl End: