From e315ed2c530791ac7222931c0f8cde5022ff984b Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Fri, 10 Nov 2017 16:28:46 +0100
Subject: [PATCH] Remove the AutoTools build system
Only cmake is supported from now on.
---
CMakeLists.txt | 1 -
Makefile.am | 45 ------------------
README | 73 ----------------------------
configure.ac | 33 -------------
doc/Makefile.am | 10 ----
doc/doxygen/Makefile.am | 7 ---
dune/Makefile.am | 5 --
dune/gfe/Makefile.am | 49 -------------------
dune/gfe/coupling/Makefile.am | 12 -----
m4/CMakeLists.txt | 3 --
m4/Makefile.am | 8 ----
m4/dune-gfe.m4 | 17 -------
src/Makefile.am | 42 -----------------
stamp-vc | 1 -
test/Makefile.am | 89 -----------------------------------
15 files changed, 395 deletions(-)
delete mode 100644 Makefile.am
delete mode 100644 README
delete mode 100644 configure.ac
delete mode 100644 doc/Makefile.am
delete mode 100644 doc/doxygen/Makefile.am
delete mode 100644 dune/Makefile.am
delete mode 100644 dune/gfe/Makefile.am
delete mode 100644 dune/gfe/coupling/Makefile.am
delete mode 100644 m4/CMakeLists.txt
delete mode 100644 m4/Makefile.am
delete mode 100644 m4/dune-gfe.m4
delete mode 100644 src/Makefile.am
delete mode 100644 stamp-vc
delete mode 100644 test/Makefile.am
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1052e51..9fbd1a32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ include(DuneMacros)
dune_project()
add_subdirectory("src")
-add_subdirectory("m4")
add_subdirectory("dune")
add_subdirectory("doc")
add_subdirectory("cmake/modules")
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index b023fe84..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-
-# we need the module file to be able to build via dunecontrol
-EXTRA_DIST=dune.module
-
-SUBDIRS = doc m4 dune src test
-
-# possible options
-LDADD = $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
-AM_CPPFLAGS += $(IPOPT_CPPFLAGS)
-
-ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include
-ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64
-ADOLC_LIBS = -ladolc
-
-noinst_PROGRAMS = finite-strain-elasticity \
- mixed-cosserat-continuum \
- rodobstacle rod-eoc
-
-finite_strain_elasticity_SOURCES = finite-strain-elasticity.cc
-finite_strain_elasticity_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
- $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS) $(UMFPACK_CPPFLAGS)
-finite_strain_elasticity_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \
- $(ADOLC_LIBS) $(PYTHON_LIBS) $(UMFPACK_LIBS)
-finite_strain_elasticity_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
- $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) $(UMFPACK_LDFLAGS)
-
-mixed_cosserat_continuum_SOURCES = mixed-cosserat-continuum.cc
-mixed_cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
- $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS)
-mixed_cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \
- $(ADOLC_LIBS) $(PYTHON_LIBS)
-mixed_cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
- $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
-
-rodobstacle_SOURCES = rodobstacle.cc
-
-rod_eoc_SOURCES = rod-eoc.cc
-
-# don't follow the full GNU-standard
-# we need automake 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
-
-include $(top_srcdir)/am/global-rules
-include $(top_srcdir)/am/top-rules
diff --git a/README b/README
deleted file mode 100644
index 02a8a9df..00000000
--- a/README
+++ /dev/null
@@ -1,73 +0,0 @@
-Preparing the Sources
-=========================
-
-Additional to the software mentioned in README you'll need the
-following programs installed on your system:
-
- automake >= 1.9
-
- autoconf >= 2.62
-
- libtool
-
-Getting started
----------------
-
-If these preliminaries are met, you should run
-
- dunecontrol all
-
-which will find all installed dune modules as well as all dune modules
-(not installed) which sources reside in a subdirectory of the current
-directory. Note that if dune is not installed properly you will either
-have to add the directory where the dunecontrol script resides (probably
-./dune-common/bin) to your path or specify the relative path of the script.
-
-On your project and all uninstalled DUNE source modules found the script
-will then calls the GNU autoconf/automake to create a ./configure-script
-and the Makefiles. Afterwards that configure script will be called and the
-modules will be build using make all
-
-Most probably you'll have to provide additional information to dunecontrol
-(e. g. compilers, configure options) and/or make options.
-
-The most convenient way is to use options files in this case. The files
-defining three variables:
-
-AUTOGEN_FLAGS flags passed to autogen
-CONFIGURE_FLAGS flags passed to configure
-MAKE_FLAGS flags passed to make
-
-An example options file might look like this:
-
-#use this options to autogen, configure and make if no other options are given
-AUTOGEN_FLAGS="--ac=2.50 --ac=1.8" #Forces automake 2,50 and autoconf 1.8
-CONFIGURE_FLAGS="CXX=g++-3.4 --prefix=/install/path" #force g++-3.4 as compiler
-MAKE_FLAGS=install #Per default run make install instead of simply make
-
-If you save this information into example.opts you can path the opts file to
-dunecontrol via the --opts option, e. g.
-
- dunecontrol --opts=example.opts all
-
-To get a full list of available configure flags just run
-
- dunecontrol configure --help
-
-after running at least
- dunecontrol autogen
-
-More info
----------
-
-See
-
- dunecontrol --help
-
-for further options.
-
-
-The full build-system is described in the dune-common/doc/buildsystem (SVN version) or under share/doc/dune-common/buildsystem if you installed DUNE!
-
-$Id$
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index fdc37ce4..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.50)
-DUNE_AC_INIT
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([src/rod3d.cc])
-AM_CONFIG_HEADER([config.h])
-
-# we need no more than the standard DUNE-stuff
-DUNE_CHECK_ALL
-
-# implicitly set the Dune-flags everywhere
-AC_SUBST(AM_CPPFLAGS, $DUNE_CPPFLAGS)
-AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
-LIBS="$DUNE_LIBS"
-
-AC_CONFIG_FILES([Makefile
- doc/Makefile
- doc/doxygen/Makefile
- doc/doxygen/Doxyfile
- dune/Makefile
- dune/gfe/Makefile
- dune/gfe/coupling/Makefile
- src/Makefile
- test/Makefile
- m4/Makefile
- dune-gfe.pc
- ])
-AC_OUTPUT
-
-# finally print the summary information
-DUNE_SUMMARY_ALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 8606374f..00000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-SUBDIRS = doxygen
-CURDIR = doc
-BASEDIR = ..
-
-# where to install the documentation too
-docdir=$(datadir)/doc/dune-gfe
-
-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 d94c751b..00000000
--- a/doc/doxygen/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-BASEDIR=../..
-CURDIR=doc/doxygen
-
-include $(top_srcdir)/am/doxygen
-include $(top_srcdir)/am/global-rules
-
diff --git a/dune/Makefile.am b/dune/Makefile.am
deleted file mode 100644
index ea2a89f7..00000000
--- a/dune/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id: $
-
-SUBDIRS = gfe
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/gfe/Makefile.am b/dune/gfe/Makefile.am
deleted file mode 100644
index b2417ba3..00000000
--- a/dune/gfe/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: $
-
-SUBDIRS = coupling
-
-AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/..
-
-srcincludedir = $(includedir)/dune/common
-srcinclude_HEADERS = averagedistanceassembler.hh \
- averageinterface.hh \
- cosseratvtkwriter.hh \
- cosseratvtkreader.hh \
- embeddedglobalgfefunction.hh \
- geodesicdifference.hh \
- geodesicfeassembler.hh \
- geodesicfefunctionadaptor.hh \
- globalgeodesicfefunction.hh \
- globalgfetestfunctionbasis.hh \
- globalgfetestfunction.hh \
- harmonicenergystiffness.hh \
- hyperbolichalfspacepoint.hh \
- linearalgebra.hh \
- localgeodesicfefunction.hh \
- localgeodesicfestiffness.hh \
- localgeodesicfefdstiffness.hh \
- localgfetestfunctionbasis.hh \
- localprojectedfefunction.hh \
- maxnormtrustregion.hh \
- orthogonalmatrix.hh \
- quaternion.hh \
- realtuple.hh \
- riemanniantrsolver.hh \
- rigidbodymotion.hh \
- rodassembler.hh \
- rodfactory.hh \
- rodlocalstiffness.hh \
- rodwriter.hh \
- rotation.hh \
- skewmatrix.hh \
- svd.hh \
- targetspacertrsolver.hh \
- tensorssd.hh \
- tensor3.hh \
- trustregionmmgbasesolver.hh \
- trustregionsolver.hh \
- trustregionsolver.cc \
- unitvector.hh \
- vtkfile.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/gfe/coupling/Makefile.am b/dune/gfe/coupling/Makefile.am
deleted file mode 100644
index ac4add80..00000000
--- a/dune/gfe/coupling/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id: $
-
-SUBDIRS =
-
-
-srcincludedir = $(includedir)/dune/common/coupling
-srcinclude_HEADERS = rodcontinuumcomplex.hh \
- rodcontinuumddstep.hh \
- rodcontinuumfixedpointstep.hh \
- rodcontinuumsteklovpoincarestep.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
deleted file mode 100644
index 25e39eb5..00000000
--- a/m4/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-install(PROGRAMS dune-gfe.m4 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal)
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 535bde10..00000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-ALLM4S = dune-gfe.m4
-
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = $(ALLM4S)
-
-EXTRA_DIST = $(ALLM4S)
-
-include $(top_srcdir)/am/global-rules
diff --git a/m4/dune-gfe.m4 b/m4/dune-gfe.m4
deleted file mode 100644
index 1fe583dd..00000000
--- a/m4/dune-gfe.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl -*- autoconf -*-
-# Macros needed to find dune-gfe and dependent libraries. They are called by
-# the macros in ${top_src_dir}/dependencies.m4, which is generated by
-# "dunecontrol autogen"
-
-# Additional checks needed to build dune-gfe
-# This macro should be invoked by every module which depends on dune-gfe, as
-# well as by dune-gfe itself
-AC_DEFUN([DUNE_GFE_CHECKS],[])
-
-# Additional checks needed to find dune-gfe
-# This macro should be invoked by every module which depends on dune-gfe, but
-# not by dune-gfe itself
-AC_DEFUN([DUNE_GFE_CHECK_MODULE],
-[
- DUNE_CHECK_MODULES([dune-gfe],[gfe/rotation.hh])
-])
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 0e9b9372..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-SUBDIRS =
-
-ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include
-ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64
-ADOLC_LIBS = -ladolc
-
-noinst_PROGRAMS = cosserat-continuum \
- harmonicmaps \
- rod3d
-
-cosserat_continuum_SOURCES = cosserat-continuum.cc
-cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
- $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS)
-cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \
- $(ADOLC_LIBS) $(PYTHON_LIBS)
-cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
- $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
-
-harmonicmaps_SOURCES = harmonicmaps.cc
-harmonicmaps_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS) \
- $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS)
-harmonicmaps_LDADD = $(UG_LIBS) $(AMIRAMESH_LIBS) \
- $(IPOPT_LIBS) $(PSURFACE_LIBS) \
- $(ADOLC_LIBS) $(PYTHON_LIBS)
-harmonicmaps_LDFLAGS = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) \
- $(IPOPT_LDFLAGS) $(PSURFACE_LDFLAGS) \
- $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
-
-rod3d_SOURCES = rod3d.cc
-rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS)
-rod3d_LDADD = $(IPOPT_LIBS)
-rod3d_LDFLAGS = $(IPOPT_LDFLAGS)
-
-# we need automake 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) CXX="$(CXX)" CC="$(CC)"
-
-include $(top_srcdir)/am/global-rules
-
diff --git a/stamp-vc b/stamp-vc
deleted file mode 100644
index ea2c89e7..00000000
--- a/stamp-vc
+++ /dev/null
@@ -1 +0,0 @@
-A stamp file to signify that this directory comes from a version control system, not an unpacked tarball
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index d56b4d36..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: Makefile.am 1867 2007-12-31 15:45:00Z sander@PCPOOL.MI.FU-BERLIN.DE $
-
-# ADOL-C while it doesn't support pkg-config yet
-# ADOLC_CPPFLAGS = -I/usr/include
-# ADOLC_LDFLAGS = -L/usr/lib
-ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include
-ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64
-ADOLC_LIBS = -ladolc
-
-
-# possible options
-LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
-AM_CPPFLAGS += $(ADOLC_CPPFLAGS) $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) -Wall $(IPOPT_CPPFLAGS) $(PYTHON_CPPFLAGS)
-
-check_PROGRAMS = adolctest \
- averagedistanceassemblertest \
- cosseratenergytest \
- frameinvariancetest \
- globalgfetestfunctionbasistest \
- harmonicenergytest \
- interpolationtest \
- interillustration \
- localgeodesicfefunctiontest \
- localgeodesicfestiffnesstest \
- localgfetestfunctiontest \
- nestednesstest \
- nonconvexitytest \
- nonconvexitytest_simple \
- orthogonalmatrixtest \
- rodassemblertest \
- rotationtest \
- svdtest \
- targetspacetest \
- true-adolctest \
- vtkreadertest
-
-adolctest_SOURCES = adolctest.cc
-adolctest_LDFLAGS = $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) $(IPOPT_LDFLAGS)
-adolctest_LDADD = $(ADOLC_LIBS) $(PYTHON_LIBS) $(IPOPT_LIBS) -lmpfr -lgmpxx -lgmp
-
-true_adolctest_SOURCES = true-adolctest.cc
-true_adolctest_LDFLAGS = $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) $(IPOPT_LDFLAGS)
-true_adolctest_LDADD = $(ADOLC_LIBS) $(PYTHON_LIBS) $(IPOPT_LIBS)
-
-frameinvariancetest_SOURCES = frameinvariancetest.cc
-
-rotationtest_SOURCES = rotationtest.cc
-
-localgeodesicfefunctiontest_SOURCES = localgeodesicfefunctiontest.cc
-
-localgeodesicfestiffnesstest_SOURCES = localgeodesicfestiffnesstest.cc
-
-localgfetestfunctiontest_SOURCES = localgfetestfunctiontest.cc
-
-nestednesstest_SOURCES = nestednesstest.cc
-
-nonconvexitytest_SOURCES = nonconvexitytest.cc
-nonconvexitytest_LDADD = -ladolc
-
-nonconvexitytest_simple_SOURCES = nonconvexitytest_simple.cc
-nonconvexitytest_simple_LDADD = -ladolc
-
-globalgfetestfunctionbasistest_SOURCES = globalgfetestfunctionbasistest.cc
-
-harmonicenergytest_SOURCES = harmonicenergytest.cc
-
-interpolationtest_SOURCES = interpolationtest.cc
-
-interillustration_SOURCES = interillustration.cc
-
-cosseratenergytest_SOURCES = cosseratenergytest.cc
-
-averagedistanceassemblertest_SOURCES = averagedistanceassemblertest.cc
-
-orthogonalmatrixtest_SOURCES = orthogonalmatrixtest.cc
-
-rodassemblertest_SOURCES = rodassemblertest.cc
-
-targetspacetest_SOURCES = targetspacetest.cc
-
-svdtest_SOURCES = svdtest.cc
-
-vtkreadertest_SOURCES = vtkreadertest.cc
-vtkreadertest_CXXFLAGS = -DHAVE_TINYXML2
-vtkreadertest_LDADD = -ltinyxml2
-
-# don't follow the full GNU-standard
-# we need automake 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
--
GitLab