Commit 60a7e90d authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[cleanup,buildsystem] Remove Autotools.

Remove deprecated, Autotools-based build system.
Use CMake-based one instead.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14939 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e026b920
...@@ -3,6 +3,9 @@ Differences Between DuMuX 2.7 and DuMuX 2.8 ...@@ -3,6 +3,9 @@ Differences Between DuMuX 2.7 and DuMuX 2.8
* IMPORTANT NOTES: * IMPORTANT NOTES:
* DELETED BUILD SYSTEM: The Autotools based build system was removed, use the
CMake based build system as it is default since Dune 2.4.
* IMPROVEMENTS and ENHANCEMENTS: * IMPROVEMENTS and ENHANCEMENTS:
- The zero equation turbulence models (zeroeq) have been added as new models - The zero equation turbulence models (zeroeq) have been added as new models
to the freeflow folder. to the freeflow folder.
...@@ -11,21 +14,21 @@ Differences Between DuMuX 2.7 and DuMuX 2.8 ...@@ -11,21 +14,21 @@ Differences Between DuMuX 2.7 and DuMuX 2.8
* IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period: * IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period:
* Deprecated PROPERTY and PARAMETER NAMES, to be removed after 2.7: BEWARE: The * Deprecated PROPERTY and PARAMETER NAMES, to be removed after 2.8: BEWARE: The
compiler will not print any warning if a deprecated property or parameter name compiler will not print any warning if a deprecated property or parameter name
is used. However, a run-time warning should appear in the summary lines after is used. However, a run-time warning should appear in the summary lines after
the corresponding run. the corresponding run.
* Deprecated CLASSES/FILES, to be removed after 2.7: * Deprecated CLASSES/FILES, to be removed after 2.8:
* Deprecated MEMBER FUNCTIONS, to be removed after 2.7: * Deprecated MEMBER FUNCTIONS, to be removed after 2.8:
* Deprecated protected MEMBER VARIABLES, to be removed after 2.7: BEWARE: Older * Deprecated protected MEMBER VARIABLES, to be removed after 2.8: BEWARE: Older
compilers will not print any warning if a deprecated protected member variable compilers will not print any warning if a deprecated protected member variable
is used. is used.
* DELETED classes/files, property names, constants/enums, * DELETED classes/files, property names, constants/enums,
member functions, which have been deprecated in DuMuX 2.6: member functions, which have been deprecated in DuMuX 2.7:
Everything listed as deprecated below has been removed. Everything listed as deprecated below has been removed.
Differences Between DuMuX 2.6 and DuMuX 2.7 Differences Between DuMuX 2.6 and DuMuX 2.7
......
# to the tarball, add all files required to make dunecontrol work
# nicely, the files for the CMake build system, some README files and
# a set of default .opts files for dunecontrol.
EXTRA_DIST = \
bin/fuzzycomparevtu.py \
bin/runTest.sh \
cmake/modules/CMakeLists.txt \
$(wildcard cmake/modules/*.cmake) \
CMakeLists.txt \
config.h.cmake \
INSTALL.cmake \
dune.module \
CHANGELOG COPYING README \
debug.opts optim.opts
SUBDIRS = doc dumux m4 patches test tutorial
# don't follow the full GNU-standard
# we need automake 1.9 or later
AUTOMAKE_OPTIONS = foreign 1.9
# pass most important options when "make distcheck" is used
DISTCHECK_CONFIGURE_FLAGS= CXX="$(CXX)" CC="$(CC)"
include $(top_srcdir)/am/top-rules
include $(top_srcdir)/am/global-rules
GXX_WARNING_OPTS=" \
-Wall \
-Wunused \
-Wmissing-include-dirs \
-Wcast-align \
-Wno-sign-compare \
-Wno-unused-parameter"
# additional -W flags for g++ which will lead to many warnings in
# other dune modules
# -Wextra \
# -Wfloat-equal \
# -Wstrict-overflow \
GXX_OPTS=" \
-fno-strict-aliasing \
-fstrict-overflow \
-g -O2"
CONFIGURE_FLAGS="\
CXXFLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
--disable-documentation \
--disable-parallel \
--disable-mpiruntest"
# for CO2 and CO2ni tests
# --enable-experimental-grid-extensions \
# --with-alugrid=PATH_TO_ALUGrid \
# need to be set in the configure flags
GXX_WARNING_OPTS=" \
-Wall \
-Wunused \
-Wmissing-include-dirs \
-Wcast-align \
-Wno-sign-compare \
-Wno-unused-parameter"
# additional -W flags for g++ which will lead to many warnings in
# other dune modules
# -Wextra \
# -Wfloat-equal \
# -Wstrict-overflow \
GXX_OPTS=" \
-fno-strict-aliasing \
-fstrict-overflow \
-ffast-math \
-fno-finite-math-only \
-O3 \
-march=native \
-DNDEBUG=1"
# configure flags
CONFIGURE_FLAGS=" \
CXXFLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
--disable-documentation \
--disable-parallel \
--disable-mpiruntest"
# for CO2 and CO2ni tests
# --enable-experimental-grid-extensions \
# --with-alugrid=PATH_TO_ALUGrid \
# need to be set in the configure flags
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
DUNE_AC_INIT # gets module version from dune.module file
AC_CONFIG_SRCDIR([dumux/common/spline.hh])
AC_CONFIG_HEADERS([config.h])
DUNE_CHECK_ALL
DUMUX_CHECKS_PRIVATE
AC_CONFIG_FILES([dumux.pc
Makefile
doc/Makefile
doc/doxygen/Makefile
doc/doxygen/Doxyfile
doc/handbook/Makefile
dumux/Makefile
dumux/common/Makefile
dumux/decoupled/Makefile
dumux/decoupled/1p/Makefile
dumux/decoupled/1p/diffusion/Makefile
dumux/decoupled/1p/diffusion/fv/Makefile
dumux/decoupled/2p/Makefile
dumux/decoupled/2p/diffusion/Makefile
dumux/decoupled/2p/diffusion/fv/Makefile
dumux/decoupled/2p/diffusion/fvmpfa/Makefile
dumux/decoupled/2p/diffusion/fvmpfa/lmethod/Makefile
dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile
dumux/decoupled/2p/diffusion/mimetic/Makefile
dumux/decoupled/2p/impes/Makefile
dumux/decoupled/2p/transport/Makefile
dumux/decoupled/2p/transport/fv/Makefile
dumux/decoupled/2p2c/Makefile
dumux/decoupled/common/Makefile
dumux/decoupled/common/fv/Makefile
dumux/decoupled/common/fv/mpfa/Makefile
dumux/decoupled/common/mimetic/Makefile
dumux/freeflow/Makefile
dumux/freeflow/stokes/Makefile
dumux/freeflow/stokesnc/Makefile
dumux/freeflow/stokesncni/Makefile
dumux/freeflow/zeroeq/Makefile
dumux/freeflow/zeroeqnc/Makefile
dumux/freeflow/zeroeqncni/Makefile
dumux/geomechanics/Makefile
dumux/geomechanics/elastic/Makefile
dumux/geomechanics/el1p2c/Makefile
dumux/geomechanics/el2p/Makefile
dumux/implicit/Makefile
dumux/implicit/1p/Makefile
dumux/implicit/1p2c/Makefile
dumux/implicit/2p/Makefile
dumux/implicit/2p2c/Makefile
dumux/implicit/2pdfm/Makefile
dumux/implicit/3p/Makefile
dumux/implicit/3p3c/Makefile
dumux/implicit/box/Makefile
dumux/implicit/cellcentered/Makefile
dumux/implicit/common/Makefile
dumux/implicit/adaptive/Makefile
dumux/implicit/co2/Makefile
dumux/implicit/nonisothermal/Makefile
dumux/implicit/mpnc/Makefile
dumux/implicit/mpnc/diffusion/Makefile
dumux/implicit/mpnc/energy/Makefile
dumux/implicit/mpnc/mass/Makefile
dumux/implicit/richards/Makefile
dumux/io/Makefile
dumux/linear/Makefile
dumux/material/Makefile
dumux/material/binarycoefficients/Makefile
dumux/material/components/Makefile
dumux/material/components/iapws/Makefile
dumux/material/fluidmatrixinteractions/Makefile
dumux/material/fluidmatrixinteractions/1p/Makefile
dumux/material/fluidmatrixinteractions/2p/Makefile
dumux/material/fluidmatrixinteractions/2pia/Makefile
dumux/material/fluidmatrixinteractions/3p/Makefile
dumux/material/fluidmatrixinteractions/mp/Makefile
dumux/material/spatialparams/Makefile
dumux/material/fluidstates/Makefile
dumux/material/fluidsystems/Makefile
dumux/material/constraintsolvers/Makefile
dumux/material/eos/Makefile
dumux/multidomain/Makefile
dumux/multidomain/2cstokes2p2c/Makefile
dumux/multidomain/2cnistokes2p2cni/Makefile
dumux/multidomain/common/Makefile
dumux/multidomain/couplinglocalresiduals/Makefile
dumux/nonlinear/Makefile
dumux/parallel/Makefile
m4/Makefile
patches/Makefile
test/Makefile
test/implicit/Makefile
test/implicit/1p/Makefile
test/implicit/1p2c/Makefile
test/implicit/2p/Makefile
test/implicit/2p2c/Makefile
test/implicit/2pdfm/Makefile
test/implicit/3p/Makefile
test/implicit/3p3c/Makefile
test/implicit/co2/Makefile
test/implicit/mpnc/Makefile
test/implicit/richards/Makefile
test/io/Makefile
test/io/gnuplotinterface/Makefile
test/common/Makefile
test/common/generalproblem/Makefile
test/common/propertysystem/Makefile
test/common/spline/Makefile
test/decoupled/Makefile
test/decoupled/1p/Makefile
test/decoupled/2p/Makefile
test/decoupled/2p2c/Makefile
test/freeflow/Makefile
test/freeflow/navierstokes/Makefile
test/freeflow/stokes/Makefile
test/freeflow/stokes2c/Makefile
test/freeflow/stokes2cni/Makefile
test/freeflow/zeroeq/Makefile
test/freeflow/zeroeq2c/Makefile
test/freeflow/zeroeq2cni/Makefile
test/geomechanics/Makefile
test/geomechanics/elastic/Makefile
test/geomechanics/el1p2c/Makefile
test/geomechanics/el2p/Makefile
test/material/Makefile
test/material/fluidmatrixinteractions/Makefile
test/material/fluidmatrixinteractions/2p/Makefile
test/material/fluidsystems/Makefile
test/material/immiscibleflash/Makefile
test/material/ncpflash/Makefile
test/material/pengrobinson/Makefile
test/material/tabulation/Makefile
test/multidomain/Makefile
test/multidomain/2cstokes2p2c/Makefile
test/multidomain/2cnistokes2p2cni/Makefile
test/multidomain/2czeroeq2p2c/Makefile
test/multidomain/2cnizeroeq2p2cni/Makefile
test/references/Makefile
tutorial/Makefile
])
# implicitly set the Dune-flags everywhere
# we need single quotes, and $(..) here because top_srcdir is only defined in the Makefile
# and not in configure
AC_SUBST(AM_CPPFLAGS, '-I$(top_srcdir) $(ALL_PKG_CPPFLAGS)' )
AC_SUBST(AM_LDFLAGS, "$ALL_PKG_LDFLAGS" )
LIBS="$DUNE_LIBS $ALL_PKG_LIBS"
AC_OUTPUT
# finally print the summary information
DUNE_SUMMARY_ALL
SUBDIRS = doxygen handbook
# setting like in dune-web
CURDIR=doc
# position of the web base directory,
# relative to $(CURDIR)
BASEDIR=..
EXTRA_DIST = $(wildcard logo/*.eps) \
CMakeLists.txt
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules
# setting like in dune-web
BASEDIR=../..
CURDIR=doc/doxygen
# add some more stuff to install and tarball
DOCFILES = $(PAGES)
EXTRA_DIST = $(PAGES) mainpage modules $(wildcard images/*.png) extradoc/parameterlist extradoc/parameters.html CMakeLists.txt
include $(top_srcdir)/am/doxygen
include $(top_srcdir)/am/global-rules
if BUILD_HANDBOOK
TEXSOURCE := $(wildcard *.tex)
MAINDOCS = dumux-handbook.pdf
DOCS = $(HTDOCS) $(MAINDOCS)
# setting like in dune-web
BASEDIR=../..
CURDIR=doc/handbook
handbookdir=$(docdir)/handbook
handbook_DATA = dumux-handbook.pdf
CLEANFILES := $(wildcard *.aux) $(wildcard *.bbl) $(wildcard *.blg) $(wildcard *.log) $(wildcard *.out) $(wildcard *.toc) $(wildcard *.dvi) $(wildcard *.ps) \
$(wildcard *.4ct) $(wildcard *.4tc) $(wildcard *.css) $(wildcard *.idv) $(wildcard *.idx) $(wildcard *.lg) $(wildcard *.tid) $(wildcard *.tmp) $(wildcard *.tms) $(wildcard *.xref)
CLEANFILES += $(DOCS)
doc: $(TEXSOURCE)
@PDFLATEX@ dumux-handbook.tex <&-
@BIBTEX@ dumux-handbook <&-
@PDFLATEX@ dumux-handbook.tex <&-
@PDFLATEX@ dumux-handbook.tex <&-
#dist-hook:
# sed $(srcdir)/Makefile.dist.am -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.am
# sed $(srcdir)/Makefile.dist.in -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.in
EXTRA_TEXINPUTS=$(top_srcdir)
else
doc:
echo -n ""
endif
dumux-handbook.pdf:
$(MAKE) $(AM_MAKEFLAGS) doc
EXTRA_DIST= dumux-handbook.pdf \
CMakeLists.txt
include $(top_srcdir)/am/global-rules
SUBDIRS = \
common \
decoupled \
freeflow \
geomechanics \
implicit \
io \
linear \
material \
multidomain \
nonlinear \
parallel
dumuxdir = $(includedir)/dumux
include $(top_srcdir)/am/global-rules
commondir = $(includedir)/dumux/common
common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
SUBDIRS = diffusion
1pdir = $(includedir)/dumux/decoupled/1p
1p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
SUBDIRS = fv
diffusiondir = $(includedir)/dumux/decoupled/1p/diffusion
diffusion_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
fvdir = $(includedir)/dumux/decoupled/1p/diffusion/fv
fv_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
SUBDIRS = diffusion impes transport
2pdir = $(includedir)/dumux/decoupled/2p
2p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
SUBDIRS = fv fvmpfa mimetic
diffusiondir = $(includedir)/dumux/decoupled/2p/diffusion
diffusion_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
fvdir = $(includedir)/dumux/decoupled/2p/diffusion/fv
fv_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
SUBDIRS = lmethod omethod
fvmpfadir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa
include $(top_srcdir)/am/global-rules
lmethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/lmethod
lmethod_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
omethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/omethod
omethod_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
mimeticdir = $(includedir)/dumux/decoupled/2p/diffusion/mimetic
mimetic_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment