From eed0fd31850c58e0b371588f76b6afd65047ce2d Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Fri, 5 Sep 2014 09:35:28 +0000
Subject: [PATCH] [buildsystem] merge from strip-pdelab: allow out-of-source
builds, make correct use of wildcards, add ALUGrid flags to tests with AMG.
Merge revisions 12949, 13246 and 13248 from the strip-pdelab branch.
They all improve the buildsystem behavior.
Thanks to Markus Blatt for the work.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13282 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
Makefile.am | 2 +-
configure.ac | 4 +++-
doc/Makefile.am | 2 +-
doc/doxygen/Makefile.am | 2 +-
doc/handbook/Makefile.am | 6 +++---
dumux/common/Makefile.am | 2 +-
dumux/decoupled/1p/Makefile.am | 2 +-
dumux/decoupled/1p/diffusion/Makefile.am | 2 +-
dumux/decoupled/1p/diffusion/fv/Makefile.am | 2 +-
dumux/decoupled/2p/Makefile.am | 2 +-
dumux/decoupled/2p/diffusion/Makefile.am | 2 +-
dumux/decoupled/2p/diffusion/fv/Makefile.am | 2 +-
.../2p/diffusion/fvmpfa/lmethod/Makefile.am | 2 +-
.../2p/diffusion/fvmpfa/omethod/Makefile.am | 2 +-
dumux/decoupled/2p/diffusion/mimetic/Makefile.am | 2 +-
dumux/decoupled/2p/impes/Makefile.am | 2 +-
dumux/decoupled/2p/transport/Makefile.am | 2 +-
dumux/decoupled/2p/transport/fv/Makefile.am | 2 +-
dumux/decoupled/2p2c/Makefile.am | 2 +-
dumux/decoupled/common/Makefile.am | 2 +-
dumux/decoupled/common/fv/Makefile.am | 2 +-
dumux/decoupled/common/fv/mpfa/Makefile.am | 2 +-
dumux/decoupled/common/mimetic/Makefile.am | 2 +-
dumux/freeflow/stokes/Makefile.am | 2 +-
dumux/freeflow/stokesnc/Makefile.am | 2 +-
dumux/freeflow/stokesncni/Makefile.am | 2 +-
dumux/geomechanics/el1p2c/Makefile.am | 2 +-
dumux/geomechanics/el2p/Makefile.am | 2 +-
dumux/geomechanics/elastic/Makefile.am | 2 +-
dumux/implicit/1p/Makefile.am | 2 +-
dumux/implicit/1p2c/Makefile.am | 2 +-
dumux/implicit/2p/Makefile.am | 2 +-
dumux/implicit/2p2c/Makefile.am | 2 +-
dumux/implicit/2p2cni/Makefile.am | 2 +-
dumux/implicit/2pdfm/Makefile.am | 2 +-
dumux/implicit/2pni/Makefile.am | 2 +-
dumux/implicit/3p/Makefile.am | 2 +-
dumux/implicit/3p3c/Makefile.am | 2 +-
dumux/implicit/3p3cni/Makefile.am | 2 +-
dumux/implicit/box/Makefile.am | 2 +-
dumux/implicit/cellcentered/Makefile.am | 2 +-
dumux/implicit/co2/Makefile.am | 2 +-
dumux/implicit/co2ni/Makefile.am | 2 +-
dumux/implicit/common/Makefile.am | 2 +-
dumux/implicit/mpnc/Makefile.am | 2 +-
dumux/implicit/mpnc/diffusion/Makefile.am | 2 +-
dumux/implicit/mpnc/energy/Makefile.am | 2 +-
dumux/implicit/mpnc/mass/Makefile.am | 2 +-
dumux/implicit/richards/Makefile.am | 2 +-
dumux/io/Makefile.am | 2 +-
dumux/linear/Makefile.am | 2 +-
dumux/material/Makefile.am | 2 +-
dumux/material/binarycoefficients/Makefile.am | 2 +-
dumux/material/components/Makefile.am | 2 +-
dumux/material/components/iapws/Makefile.am | 2 +-
dumux/material/constraintsolvers/Makefile.am | 2 +-
dumux/material/eos/Makefile.am | 2 +-
.../fluidmatrixinteractions/2p/Makefile.am | 2 +-
.../fluidmatrixinteractions/2pia/Makefile.am | 2 +-
.../fluidmatrixinteractions/3p/Makefile.am | 2 +-
.../material/fluidmatrixinteractions/Makefile.am | 2 +-
.../fluidmatrixinteractions/mp/Makefile.am | 2 +-
dumux/material/fluidstates/Makefile.am | 2 +-
dumux/material/fluidsystems/Makefile.am | 2 +-
dumux/material/spatialparams/Makefile.am | 2 +-
dumux/multidomain/2cnistokes2p2cni/Makefile.am | 2 +-
dumux/multidomain/2cstokes2p2c/Makefile.am | 2 +-
dumux/multidomain/common/Makefile.am | 2 +-
.../couplinglocalresiduals/Makefile.am | 2 +-
dumux/nonlinear/Makefile.am | 2 +-
dumux/parallel/Makefile.am | 2 +-
patches/Makefile.am | 2 +-
test/common/generalproblem/Makefile.am | 4 ++--
test/decoupled/1p/Makefile.am | 4 ++--
test/decoupled/2p/Makefile.am | 4 ++--
test/decoupled/2p2c/Makefile.am | 4 ++--
test/freeflow/navierstokes/Makefile.am | 4 ++--
test/freeflow/stokes/Makefile.am | 4 ++--
test/freeflow/stokes2c/Makefile.am | 4 ++--
test/freeflow/stokes2cni/Makefile.am | 4 ++--
test/geomechanics/el1p2c/Makefile.am | 4 ++--
test/geomechanics/el2p/Makefile.am | 4 ++--
test/geomechanics/elastic/Makefile.am | 4 ++--
test/implicit/1p/CMakeLists.txt | 2 ++
test/implicit/1p/Makefile.am | 4 ++--
test/implicit/1p2c/Makefile.am | 4 ++--
test/implicit/2p/Makefile.am | 4 ++--
test/implicit/2p2c/Makefile.am | 4 ++--
test/implicit/2p2cni/Makefile.am | 4 ++--
test/implicit/2pdfm/Makefile.am | 4 ++--
test/implicit/2pni/Makefile.am | 4 ++--
test/implicit/3p/Makefile.am | 4 ++--
test/implicit/3p3c/Makefile.am | 4 ++--
test/implicit/3p3cni/Makefile.am | 4 ++--
test/implicit/co2/Makefile.am | 4 ++--
test/implicit/co2ni/Makefile.am | 4 ++--
test/implicit/mpnc/Makefile.am | 6 +++---
test/implicit/richards/Makefile.am | 4 ++--
test/material/fluidsystems/Makefile.am | 2 +-
test/multidomain/2cnistokes2p2cni/Makefile.am | 4 ++--
test/multidomain/2cstokes2p2c/Makefile.am | 4 ++--
test/references/Makefile.am | 2 +-
tutorial/Makefile.am | 16 ++++++++--------
103 files changed, 143 insertions(+), 139 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 26a545db39..da3952590b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = \
bin/fuzzycomparevtu.py \
bin/runTest.sh \
cmake/modules/CMakeLists.txt \
- cmake/modules/*.cmake \
+ cmake/modules/$(wildcard *.cmake) \
CMakeLists.txt \
config.h.cmake \
INSTALL.cmake \
diff --git a/configure.ac b/configure.ac
index 3683cf0f15..2f80484a5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,9 @@ AC_CONFIG_FILES([dumux.pc
])
# implicitly set the Dune-flags everywhere
-AC_SUBST(AM_CPPFLAGS, "$ALL_PKG_CPPFLAGS" )
+# 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"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 602b54fa5e..e316c488ee 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,7 +6,7 @@ CURDIR=doc
# relative to $(CURDIR)
BASEDIR=..
-EXTRA_DIST = logo/*.eps
+EXTRA_DIST = logo/$(wildcard *.eps)
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 5f2110cfc7..780b703f6b 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -4,7 +4,7 @@ CURDIR=doc/doxygen
# add some more stuff to install and tarball
DOCFILES = $(PAGES)
-EXTRA_DIST = $(PAGES) mainpage modules images/*.png extradoc/parameterlist extradoc/parameters.html
+EXTRA_DIST = $(PAGES) mainpage modules images/$(wildcard *.png) extradoc/parameterlist extradoc/parameters.html
include $(top_srcdir)/am/doxygen
include $(top_srcdir)/am/global-rules
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 24e8987366..5aeeee4d85 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -1,5 +1,5 @@
if BUILD_HANDBOOK
-TEXSOURCE = *.tex
+TEXSOURCE := $(wildcard *.tex)
MAINDOCS = dumux-handbook.pdf
DOCS = $(HTDOCS) $(MAINDOCS)
@@ -11,8 +11,8 @@ CURDIR=doc/handbook
handbookdir=$(docdir)/handbook
handbook_DATA = dumux-handbook.pdf
-CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps
-CLEANFILES += *.4ct *.4tc *.css *.idv *.idx *.lg *.tid *.tmp *.tms *.xref
+CLEANFILES := $(wildcard *.aux) $(wildcard *.bbl) $(wildcard *.blg) $(wildcard *.log) $(wildcard *.out) $(wildcard *.toc) $(wildcard *.dvi) $(wildcard *.ps)
+CLEANFILES +:= $(wildcard *.4ct) $(wildcard *.4tc) $(wildcard *.css) $(wildcard *.idv) $(wildcard *.idx) $(wildcard *.lg) $(wildcard *.tid) $(wildcard *.tmp) $(wildcard *.tms) $(wildcard *.xref)
CLEANFILES += $(DOCS)
doc: $(TEXSOURCE)
diff --git a/dumux/common/Makefile.am b/dumux/common/Makefile.am
index 0d88b82ce6..724029d2df 100644
--- a/dumux/common/Makefile.am
+++ b/dumux/common/Makefile.am
@@ -1,4 +1,4 @@
commondir = $(includedir)/dumux/common
-common_HEADERS = *.hh
+common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/1p/Makefile.am b/dumux/decoupled/1p/Makefile.am
index 62e85dc862..b745eb839a 100644
--- a/dumux/decoupled/1p/Makefile.am
+++ b/dumux/decoupled/1p/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = diffusion
1pdir = $(includedir)/dumux/decoupled/1p
-1p_HEADERS = *.hh
+1p_HEADERS := $(wildcard *.hh)
diff --git a/dumux/decoupled/1p/diffusion/Makefile.am b/dumux/decoupled/1p/diffusion/Makefile.am
index 2ca7d2cf25..c1ad482e94 100644
--- a/dumux/decoupled/1p/diffusion/Makefile.am
+++ b/dumux/decoupled/1p/diffusion/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = fv
diffusiondir = $(includedir)/dumux/decoupled/1p/diffusion
-diffusion_HEADERS = *.hh
+diffusion_HEADERS := $(wildcard *.hh)
diff --git a/dumux/decoupled/1p/diffusion/fv/Makefile.am b/dumux/decoupled/1p/diffusion/fv/Makefile.am
index c36d4c2726..d2e7985469 100644
--- a/dumux/decoupled/1p/diffusion/fv/Makefile.am
+++ b/dumux/decoupled/1p/diffusion/fv/Makefile.am
@@ -1,5 +1,5 @@
fvdir = $(includedir)/dumux/decoupled/1p/diffusion/fv
-fv_HEADERS = *.hh
+fv_HEADERS := $(wildcard *.hh)
diff --git a/dumux/decoupled/2p/Makefile.am b/dumux/decoupled/2p/Makefile.am
index 1443f48ae2..55a6ca0a29 100644
--- a/dumux/decoupled/2p/Makefile.am
+++ b/dumux/decoupled/2p/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = diffusion impes transport
2pdir = $(includedir)/dumux/decoupled/2p
-2p_HEADERS = *.hh
+2p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/diffusion/Makefile.am b/dumux/decoupled/2p/diffusion/Makefile.am
index b38a180ec7..75347619ad 100644
--- a/dumux/decoupled/2p/diffusion/Makefile.am
+++ b/dumux/decoupled/2p/diffusion/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = fv fvmpfa mimetic
diffusiondir = $(includedir)/dumux/decoupled/2p/diffusion
-diffusion_HEADERS = *.hh
+diffusion_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/diffusion/fv/Makefile.am b/dumux/decoupled/2p/diffusion/fv/Makefile.am
index 9609dfd017..c50008b4e1 100644
--- a/dumux/decoupled/2p/diffusion/fv/Makefile.am
+++ b/dumux/decoupled/2p/diffusion/fv/Makefile.am
@@ -1,4 +1,4 @@
fvdir = $(includedir)/dumux/decoupled/2p/diffusion/fv
-fv_HEADERS = *.hh
+fv_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/Makefile.am b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/Makefile.am
index e57741583b..020a8b528c 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/Makefile.am
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/Makefile.am
@@ -1,4 +1,4 @@
lmethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/lmethod
-lmethod_HEADERS = *.hh
+lmethod_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am
index c1a2de3309..5893b3bf4e 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am
@@ -1,4 +1,4 @@
omethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/omethod
-omethod_HEADERS = *.hh
+omethod_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/diffusion/mimetic/Makefile.am b/dumux/decoupled/2p/diffusion/mimetic/Makefile.am
index 56d2911c7c..dfbe2daf3a 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/Makefile.am
+++ b/dumux/decoupled/2p/diffusion/mimetic/Makefile.am
@@ -1,4 +1,4 @@
mimeticdir = $(includedir)/dumux/decoupled/2p/diffusion/mimetic
-mimetic_HEADERS = *.hh
+mimetic_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/impes/Makefile.am b/dumux/decoupled/2p/impes/Makefile.am
index 5a008c5c20..b53c00cbb8 100644
--- a/dumux/decoupled/2p/impes/Makefile.am
+++ b/dumux/decoupled/2p/impes/Makefile.am
@@ -1,4 +1,4 @@
impesdir = $(includedir)/dumux/decoupled/2p/impes
-impes_HEADERS = *.hh
+impes_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/transport/Makefile.am b/dumux/decoupled/2p/transport/Makefile.am
index c0a7e0d4d0..35e9f2ec21 100644
--- a/dumux/decoupled/2p/transport/Makefile.am
+++ b/dumux/decoupled/2p/transport/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = fv
transportdir = $(includedir)/dumux/decoupled/2p/transport
-transport_HEADERS = *.hh
+transport_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/transport/fv/Makefile.am b/dumux/decoupled/2p/transport/fv/Makefile.am
index 0edf20b0fe..a815c62a5c 100644
--- a/dumux/decoupled/2p/transport/fv/Makefile.am
+++ b/dumux/decoupled/2p/transport/fv/Makefile.am
@@ -1,4 +1,4 @@
fvdir = $(includedir)/dumux/decoupled/2p/transport/fv
-fv_HEADERS = *.hh
+fv_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p2c/Makefile.am b/dumux/decoupled/2p2c/Makefile.am
index 5433c45426..64c1c3245a 100644
--- a/dumux/decoupled/2p2c/Makefile.am
+++ b/dumux/decoupled/2p2c/Makefile.am
@@ -1,4 +1,4 @@
2p2cdir = $(includedir)/dumux/decoupled/2p2c
-2p2c_HEADERS = *.hh
+2p2c_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/common/Makefile.am b/dumux/decoupled/common/Makefile.am
index ae5189bf2f..2603105db5 100644
--- a/dumux/decoupled/common/Makefile.am
+++ b/dumux/decoupled/common/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = fv mimetic
commondir = $(includedir)/dumux/decoupled/common
-common_HEADERS = *.hh
+common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/common/fv/Makefile.am b/dumux/decoupled/common/fv/Makefile.am
index e4d9d12185..a610bf7834 100644
--- a/dumux/decoupled/common/fv/Makefile.am
+++ b/dumux/decoupled/common/fv/Makefile.am
@@ -1,5 +1,5 @@
fvdir = $(includedir)/dumux/decoupled/common/fv
-fv_HEADERS = *.hh
+fv_HEADERS := $(wildcard *.hh)
SUBDIRS = mpfa
diff --git a/dumux/decoupled/common/fv/mpfa/Makefile.am b/dumux/decoupled/common/fv/mpfa/Makefile.am
index bbe7eb523d..95f3c6096a 100644
--- a/dumux/decoupled/common/fv/mpfa/Makefile.am
+++ b/dumux/decoupled/common/fv/mpfa/Makefile.am
@@ -1,4 +1,4 @@
mpfadir = $(includedir)/dumux/decoupled/common/fv/mpfa
-mpfa_HEADERS = *.hh
+mpfa_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/common/mimetic/Makefile.am b/dumux/decoupled/common/mimetic/Makefile.am
index ce9aade521..8c989a611d 100644
--- a/dumux/decoupled/common/mimetic/Makefile.am
+++ b/dumux/decoupled/common/mimetic/Makefile.am
@@ -1,4 +1,4 @@
mimeticdir = $(includedir)/dumux/decoupled/common/mimetic
-mimetic_HEADERS = *.hh
+mimetic_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/freeflow/stokes/Makefile.am b/dumux/freeflow/stokes/Makefile.am
index 7cf63a30f3..bb2b41527a 100644
--- a/dumux/freeflow/stokes/Makefile.am
+++ b/dumux/freeflow/stokes/Makefile.am
@@ -1,4 +1,4 @@
stokesdir = $(includedir)/dumux/freeflow/stokes
-stokes_HEADERS = *.hh
+stokes_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/freeflow/stokesnc/Makefile.am b/dumux/freeflow/stokesnc/Makefile.am
index f2cb676563..e709ebacb1 100644
--- a/dumux/freeflow/stokesnc/Makefile.am
+++ b/dumux/freeflow/stokesnc/Makefile.am
@@ -1,4 +1,4 @@
stokesncdir = $(includedir)/dumux/freeflow/stokesnc
-stokesnc_HEADERS = *.hh
+stokesnc_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/freeflow/stokesncni/Makefile.am b/dumux/freeflow/stokesncni/Makefile.am
index 96b5373d69..63f64e801b 100644
--- a/dumux/freeflow/stokesncni/Makefile.am
+++ b/dumux/freeflow/stokesncni/Makefile.am
@@ -1,4 +1,4 @@
stokesncnidir = $(includedir)/dumux/freeflow/stokesncni
-stokesncni_HEADERS = *.hh
+stokesncni_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/geomechanics/el1p2c/Makefile.am b/dumux/geomechanics/el1p2c/Makefile.am
index 0270b95bda..d073abdc37 100644
--- a/dumux/geomechanics/el1p2c/Makefile.am
+++ b/dumux/geomechanics/el1p2c/Makefile.am
@@ -1,5 +1,5 @@
el1p2cdir = $(includedir)/dumux/geomechanics/el1p2c
-el1p2c_HEADERS = *.hh
+el1p2c_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/geomechanics/el2p/Makefile.am b/dumux/geomechanics/el2p/Makefile.am
index 852f360ea3..94d114c8c1 100644
--- a/dumux/geomechanics/el2p/Makefile.am
+++ b/dumux/geomechanics/el2p/Makefile.am
@@ -1,5 +1,5 @@
el2pdir = $(includedir)/dumux/geomechanics/el2p
-el2p_HEADERS = *.hh
+el2p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/geomechanics/elastic/Makefile.am b/dumux/geomechanics/elastic/Makefile.am
index 1187acc519..fa2bd32f63 100644
--- a/dumux/geomechanics/elastic/Makefile.am
+++ b/dumux/geomechanics/elastic/Makefile.am
@@ -1,5 +1,5 @@
elasticdir = $(includedir)/dumux/geomechanics/elastic
-elastic_HEADERS = *.hh
+elastic_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/1p/Makefile.am b/dumux/implicit/1p/Makefile.am
index b7eca62774..3f9dc05dfa 100644
--- a/dumux/implicit/1p/Makefile.am
+++ b/dumux/implicit/1p/Makefile.am
@@ -1,4 +1,4 @@
1pdir = $(includedir)/dumux/implicit/1p
-1p_HEADERS = *.hh
+1p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/1p2c/Makefile.am b/dumux/implicit/1p2c/Makefile.am
index 76f7462a3f..63658c9cc9 100644
--- a/dumux/implicit/1p2c/Makefile.am
+++ b/dumux/implicit/1p2c/Makefile.am
@@ -1,4 +1,4 @@
1p2cdir = $(includedir)/dumux/implicit/1p2c
-1p2c_HEADERS = *.hh
+1p2c_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/2p/Makefile.am b/dumux/implicit/2p/Makefile.am
index 85973916fc..8f38ebaede 100644
--- a/dumux/implicit/2p/Makefile.am
+++ b/dumux/implicit/2p/Makefile.am
@@ -1,5 +1,5 @@
2pdir = $(includedir)/dumux/implicit/2p
-2p_HEADERS = *.hh
+2p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/2p2c/Makefile.am b/dumux/implicit/2p2c/Makefile.am
index e4f87725e6..534d1460ea 100644
--- a/dumux/implicit/2p2c/Makefile.am
+++ b/dumux/implicit/2p2c/Makefile.am
@@ -1,4 +1,4 @@
2p2cdir = $(includedir)/dumux/implicit/2p2c
-2p2c_HEADERS = *.hh
+2p2c_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/2p2cni/Makefile.am b/dumux/implicit/2p2cni/Makefile.am
index 21d36f8026..8fa2ae7c42 100644
--- a/dumux/implicit/2p2cni/Makefile.am
+++ b/dumux/implicit/2p2cni/Makefile.am
@@ -1,4 +1,4 @@
2p2cnidir = $(includedir)/dumux/implicit/2p2cni
-2p2cni_HEADERS = *.hh
+2p2cni_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/2pdfm/Makefile.am b/dumux/implicit/2pdfm/Makefile.am
index 936fb69048..8b2788d061 100644
--- a/dumux/implicit/2pdfm/Makefile.am
+++ b/dumux/implicit/2pdfm/Makefile.am
@@ -1,4 +1,4 @@
2pdfmdir = $(includedir)/dumux/implicit/2pdfm
-2pdfm_HEADERS = *.hh
+2pdfm_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/2pni/Makefile.am b/dumux/implicit/2pni/Makefile.am
index 341609deb6..62ed49a140 100644
--- a/dumux/implicit/2pni/Makefile.am
+++ b/dumux/implicit/2pni/Makefile.am
@@ -1,4 +1,4 @@
2pnidir = $(includedir)/dumux/implicit/2pni
-2pni_HEADERS = *.hh
+2pni_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/3p/Makefile.am b/dumux/implicit/3p/Makefile.am
index f50519766e..53b283d826 100644
--- a/dumux/implicit/3p/Makefile.am
+++ b/dumux/implicit/3p/Makefile.am
@@ -1,4 +1,4 @@
3pdir = $(includedir)/dumux/implicit/3p
-3p_HEADERS = *.hh
+3p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/3p3c/Makefile.am b/dumux/implicit/3p3c/Makefile.am
index dd384df9a4..a80d2ee979 100644
--- a/dumux/implicit/3p3c/Makefile.am
+++ b/dumux/implicit/3p3c/Makefile.am
@@ -1,4 +1,4 @@
3p3cdir = $(includedir)/dumux/implicit/3p3c
-3p3c_HEADERS = *.hh
+3p3c_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/3p3cni/Makefile.am b/dumux/implicit/3p3cni/Makefile.am
index 4c5b3ec71e..c960520f8b 100644
--- a/dumux/implicit/3p3cni/Makefile.am
+++ b/dumux/implicit/3p3cni/Makefile.am
@@ -1,4 +1,4 @@
3p3cnidir = $(includedir)/dumux/implicit/3p3cni
-3p3cni_HEADERS = *.hh
+3p3cni_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/box/Makefile.am b/dumux/implicit/box/Makefile.am
index 27c0a4d5a3..16781341e0 100644
--- a/dumux/implicit/box/Makefile.am
+++ b/dumux/implicit/box/Makefile.am
@@ -1,4 +1,4 @@
commondir = $(includedir)/dumux/implicit/common
-common_HEADERS = *.hh
+common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/cellcentered/Makefile.am b/dumux/implicit/cellcentered/Makefile.am
index 79882bb6f4..5102a0f1ee 100644
--- a/dumux/implicit/cellcentered/Makefile.am
+++ b/dumux/implicit/cellcentered/Makefile.am
@@ -1,4 +1,4 @@
commondir = $(includedir)/dumux/ccmodels/common
-common_HEADERS = *.hh
+common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/co2/Makefile.am b/dumux/implicit/co2/Makefile.am
index 168bc5e166..addfd9db7d 100644
--- a/dumux/implicit/co2/Makefile.am
+++ b/dumux/implicit/co2/Makefile.am
@@ -1,4 +1,4 @@
co2dir = $(includedir)/dumux/implicit/co2
-co2_HEADERS = *.hh
+co2_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/co2ni/Makefile.am b/dumux/implicit/co2ni/Makefile.am
index bf8622f6c5..84015b26f8 100644
--- a/dumux/implicit/co2ni/Makefile.am
+++ b/dumux/implicit/co2ni/Makefile.am
@@ -1,4 +1,4 @@
co2nidir = $(includedir)/dumux/implicit/co2ni
-co2ni_HEADERS = *.hh
+co2ni_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/common/Makefile.am b/dumux/implicit/common/Makefile.am
index 27c0a4d5a3..16781341e0 100644
--- a/dumux/implicit/common/Makefile.am
+++ b/dumux/implicit/common/Makefile.am
@@ -1,4 +1,4 @@
commondir = $(includedir)/dumux/implicit/common
-common_HEADERS = *.hh
+common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/mpnc/Makefile.am b/dumux/implicit/mpnc/Makefile.am
index f6e46bb5e5..5323ace079 100644
--- a/dumux/implicit/mpnc/Makefile.am
+++ b/dumux/implicit/mpnc/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = diffusion energy mass
mpncdir = $(includedir)/dumux/implicit/mpnc
-mpnc_HEADERS = *.hh
+mpnc_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/mpnc/diffusion/Makefile.am b/dumux/implicit/mpnc/diffusion/Makefile.am
index cd3f739c41..7a84c28cbe 100644
--- a/dumux/implicit/mpnc/diffusion/Makefile.am
+++ b/dumux/implicit/mpnc/diffusion/Makefile.am
@@ -1,4 +1,4 @@
diffusiondir = $(includedir)/dumux/implicit/mpnc/diffusion
-diffusion_HEADERS = *.hh
+diffusion_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/mpnc/energy/Makefile.am b/dumux/implicit/mpnc/energy/Makefile.am
index 340ad53b2d..e53d013761 100644
--- a/dumux/implicit/mpnc/energy/Makefile.am
+++ b/dumux/implicit/mpnc/energy/Makefile.am
@@ -1,4 +1,4 @@
energydir = $(includedir)/dumux/implicit/mpnc/energy
-energy_HEADERS = *.hh
+energy_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/mpnc/mass/Makefile.am b/dumux/implicit/mpnc/mass/Makefile.am
index 79d93ab0a8..3f37abca5b 100644
--- a/dumux/implicit/mpnc/mass/Makefile.am
+++ b/dumux/implicit/mpnc/mass/Makefile.am
@@ -1,4 +1,4 @@
massdir = $(includedir)/dumux/implicit/mpnc/mass
-mass_HEADERS = *.hh
+mass_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/implicit/richards/Makefile.am b/dumux/implicit/richards/Makefile.am
index e3639f38e9..db507617bb 100644
--- a/dumux/implicit/richards/Makefile.am
+++ b/dumux/implicit/richards/Makefile.am
@@ -1,4 +1,4 @@
richardsdir = $(includedir)/dumux/implicit/richards
-richards_HEADERS = *.hh
+richards_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/io/Makefile.am b/dumux/io/Makefile.am
index dedcf10ab5..1f2bddeccb 100644
--- a/dumux/io/Makefile.am
+++ b/dumux/io/Makefile.am
@@ -1,4 +1,4 @@
iodir = $(includedir)/dumux/io
-io_HEADERS = *.hh
+io_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/linear/Makefile.am b/dumux/linear/Makefile.am
index 6b9f52209c..1dc6fcd0ef 100644
--- a/dumux/linear/Makefile.am
+++ b/dumux/linear/Makefile.am
@@ -1,4 +1,4 @@
lineardir = $(includedir)/dumux/linear
-linear_HEADERS = *.hh
+linear_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/Makefile.am b/dumux/material/Makefile.am
index 7e8d7cf2a6..4db89a516a 100644
--- a/dumux/material/Makefile.am
+++ b/dumux/material/Makefile.am
@@ -9,6 +9,6 @@ SUBDIRS = \
spatialparams
materialdir = $(includedir)/dumux/material
-material_HEADERS = *.hh
+material_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/binarycoefficients/Makefile.am b/dumux/material/binarycoefficients/Makefile.am
index 18677c25b1..d7ae0339c2 100644
--- a/dumux/material/binarycoefficients/Makefile.am
+++ b/dumux/material/binarycoefficients/Makefile.am
@@ -1,4 +1,4 @@
binarycoefficientsdir = $(includedir)/dumux/material/binarycoefficients
-binarycoefficients_HEADERS = *.hh
+binarycoefficients_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/components/Makefile.am b/dumux/material/components/Makefile.am
index a45229b952..7314782e4f 100644
--- a/dumux/material/components/Makefile.am
+++ b/dumux/material/components/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = iapws
componentsdir = $(includedir)/dumux/material/components
-components_HEADERS = *.hh
+components_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/components/iapws/Makefile.am b/dumux/material/components/iapws/Makefile.am
index f3ea40c469..a42f5911db 100644
--- a/dumux/material/components/iapws/Makefile.am
+++ b/dumux/material/components/iapws/Makefile.am
@@ -1,4 +1,4 @@
iapwsdir = $(includedir)/dumux/material/components/iapws
-iapws_HEADERS = *.hh
+iapws_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/constraintsolvers/Makefile.am b/dumux/material/constraintsolvers/Makefile.am
index fbcaa287aa..f67a082ef6 100644
--- a/dumux/material/constraintsolvers/Makefile.am
+++ b/dumux/material/constraintsolvers/Makefile.am
@@ -1,4 +1,4 @@
constraintsolversdir = $(includedir)/dumux/material/constraintsolvers
-constraintsolvers_HEADERS = *.hh
+constraintsolvers_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/eos/Makefile.am b/dumux/material/eos/Makefile.am
index 4b728c1730..0911206176 100644
--- a/dumux/material/eos/Makefile.am
+++ b/dumux/material/eos/Makefile.am
@@ -1,4 +1,4 @@
eosdir = $(includedir)/dumux/material/eos
-eos_HEADERS = *.hh
+eos_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/2p/Makefile.am b/dumux/material/fluidmatrixinteractions/2p/Makefile.am
index 68a6185f90..9def076998 100644
--- a/dumux/material/fluidmatrixinteractions/2p/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/2p/Makefile.am
@@ -1,4 +1,4 @@
2pdir = $(includedir)/dumux/material/fluidmatrixinteractions/2p
-2p_HEADERS = *.hh
+2p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/2pia/Makefile.am b/dumux/material/fluidmatrixinteractions/2pia/Makefile.am
index bf2867314c..58879d6bbe 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/2pia/Makefile.am
@@ -1,4 +1,4 @@
2piadir = $(includedir)/dumux/material/fluidmatrixinteractions/2pia
-2pia_HEADERS = *.hh
+2pia_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/3p/Makefile.am b/dumux/material/fluidmatrixinteractions/3p/Makefile.am
index ecd25a1e9f..67c57ef61b 100644
--- a/dumux/material/fluidmatrixinteractions/3p/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/3p/Makefile.am
@@ -1,4 +1,4 @@
3pdir = $(includedir)/dumux/material/fluidmatrixinteractions/3p
-3p_HEADERS = *.hh
+3p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/Makefile.am b/dumux/material/fluidmatrixinteractions/Makefile.am
index d3c3e3ce04..832bf3d08c 100644
--- a/dumux/material/fluidmatrixinteractions/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = 1p 2p 2pia 3p mp
fluidmatrixinteractionsdir = $(includedir)/dumux/material/fluidmatrixinteractions
-fluidmatrixinteractions_HEADERS = *.hh
+fluidmatrixinteractions_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/mp/Makefile.am b/dumux/material/fluidmatrixinteractions/mp/Makefile.am
index bb1d1376be..65a60a29fb 100644
--- a/dumux/material/fluidmatrixinteractions/mp/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/mp/Makefile.am
@@ -1,4 +1,4 @@
mpdir = $(includedir)/dumux/material/fluidmatrixinteractions/Mp
-mp_HEADERS = *.hh
+mp_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidstates/Makefile.am b/dumux/material/fluidstates/Makefile.am
index 46d4e003b7..8fc80956e0 100644
--- a/dumux/material/fluidstates/Makefile.am
+++ b/dumux/material/fluidstates/Makefile.am
@@ -1,4 +1,4 @@
fluidstatesdir = $(includedir)/dumux/material/fluidstates
-fluidstates_HEADERS = *.hh
+fluidstates_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidsystems/Makefile.am b/dumux/material/fluidsystems/Makefile.am
index fc6f9a87b5..e7ad6b21c1 100644
--- a/dumux/material/fluidsystems/Makefile.am
+++ b/dumux/material/fluidsystems/Makefile.am
@@ -1,4 +1,4 @@
fluidsystemsdir = $(includedir)/dumux/material/fluidsystems
-fluidsystems_HEADERS = *.hh
+fluidsystems_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/spatialparams/Makefile.am b/dumux/material/spatialparams/Makefile.am
index b7849a45ab..d0ad304b81 100644
--- a/dumux/material/spatialparams/Makefile.am
+++ b/dumux/material/spatialparams/Makefile.am
@@ -1,4 +1,4 @@
spatialparamsdir = $(includedir)/dumux/material/spatialparams
-spatialparams_HEADERS = *.hh
+spatialparams_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/multidomain/2cnistokes2p2cni/Makefile.am b/dumux/multidomain/2cnistokes2p2cni/Makefile.am
index 003f38efe6..86dccb3d53 100644
--- a/dumux/multidomain/2cnistokes2p2cni/Makefile.am
+++ b/dumux/multidomain/2cnistokes2p2cni/Makefile.am
@@ -1,5 +1,5 @@
2cnistokes2p2cnidir = $(includedir)/dumux/multidomain/2cnistokes2p2cni
-2cnistokes2p2cni_HEADERS = *.hh
+2cnistokes2p2cni_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = 2cnistokes2p2cnilocaloperator.hh
diff --git a/dumux/multidomain/2cstokes2p2c/Makefile.am b/dumux/multidomain/2cstokes2p2c/Makefile.am
index 347b9a5148..345c1ed6b8 100644
--- a/dumux/multidomain/2cstokes2p2c/Makefile.am
+++ b/dumux/multidomain/2cstokes2p2c/Makefile.am
@@ -1,5 +1,5 @@
2cstokes2p2cdir = $(includedir)/dumux/multidomain/2cstokes2p2c
-2cstokes2p2c_HEADERS = *.hh
+2cstokes2p2c_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = \
diff --git a/dumux/multidomain/common/Makefile.am b/dumux/multidomain/common/Makefile.am
index ada66d91e8..1f03763b6f 100644
--- a/dumux/multidomain/common/Makefile.am
+++ b/dumux/multidomain/common/Makefile.am
@@ -1,5 +1,5 @@
commondir = $(includedir)/dumux/multidomain/common
-common_HEADERS = *.hh
+common_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = \
diff --git a/dumux/multidomain/couplinglocalresiduals/Makefile.am b/dumux/multidomain/couplinglocalresiduals/Makefile.am
index ba47b95735..da7e2d2ad5 100644
--- a/dumux/multidomain/couplinglocalresiduals/Makefile.am
+++ b/dumux/multidomain/couplinglocalresiduals/Makefile.am
@@ -1,5 +1,5 @@
couplinglocalresidualsdir = $(includedir)/dumux/multidomain/couplinglocalresiduals
-couplinglocalresiduals_HEADERS = *.hh
+couplinglocalresiduals_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = \
diff --git a/dumux/nonlinear/Makefile.am b/dumux/nonlinear/Makefile.am
index 0820938aef..bc3a909021 100644
--- a/dumux/nonlinear/Makefile.am
+++ b/dumux/nonlinear/Makefile.am
@@ -1,4 +1,4 @@
nonlineardir = $(includedir)/dumux/nonlinear
-nonlinear_HEADERS = *.hh
+nonlinear_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/dumux/parallel/Makefile.am b/dumux/parallel/Makefile.am
index 0ddf467269..5691897887 100644
--- a/dumux/parallel/Makefile.am
+++ b/dumux/parallel/Makefile.am
@@ -1,4 +1,4 @@
paralleldir = $(includedir)/dumux/parallel
-parallel_HEADERS = *.hh
+parallel_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/patches/Makefile.am b/patches/Makefile.am
index df940a5d9c..e3c92a9287 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,5 +1,5 @@
patchesdir = $(includedir)/patches
-EXTRA_DIST=*.patch README
+EXTRA_DIST:=$(wildcard *.patch) README
include $(top_srcdir)/am/global-rules
diff --git a/test/common/generalproblem/Makefile.am b/test/common/generalproblem/Makefile.am
index 73d20db662..d66c32d0ea 100644
--- a/test/common/generalproblem/Makefile.am
+++ b/test/common/generalproblem/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_generalproblem2p
-noinst_HEADERS = *.hh
-EXTRA_DIST= *.input CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:= $(wildcard *.input) CMakeLists.txt
test_generalproblem2p_SOURCES = test_generalproblem2p.cc
diff --git a/test/decoupled/1p/Makefile.am b/test/decoupled/1p/Makefile.am
index 5f203dfb01..5020528219 100644
--- a/test/decoupled/1p/Makefile.am
+++ b/test/decoupled/1p/Makefile.am
@@ -1,8 +1,8 @@
# tests where program to build and program to run are equal
check_PROGRAMS = test_diffusion test_diffusion3d test_1p
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_diffusion_SOURCES = test_diffusion.cc
diff --git a/test/decoupled/2p/Makefile.am b/test/decoupled/2p/Makefile.am
index bc411f8844..daae274ae0 100644
--- a/test/decoupled/2p/Makefile.am
+++ b/test/decoupled/2p/Makefile.am
@@ -5,8 +5,8 @@ check_PROGRAMS = test_impes \
test_mpfa2p \
test_3d2p
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_impes_SOURCES = test_impes.cc
diff --git a/test/decoupled/2p2c/Makefile.am b/test/decoupled/2p2c/Makefile.am
index fa045ae9cf..afa0a40a8e 100644
--- a/test/decoupled/2p2c/Makefile.am
+++ b/test/decoupled/2p2c/Makefile.am
@@ -1,12 +1,12 @@
# programs just to build when "make check" is used
check_PROGRAMS = test_adaptive2p2c2d test_adaptive2p2c3d test_dec2p2c test_multiphysics2p2c
-noinst_HEADERS = *.hh
+noinst_HEADERS := $(wildcard *.hh)
test_adaptive2p2c2d_SOURCES = test_adaptive2p2c2d.cc
test_adaptive2p2c3d_SOURCES = test_adaptive2p2c3d.cc
test_dec2p2c_SOURCES = test_dec2p2c.cc
test_multiphysics2p2c_SOURCES = test_multiphysics2p2c.cc
-EXTRA_DIST=*.input CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) CMakeLists.txt
include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/navierstokes/Makefile.am b/test/freeflow/navierstokes/Makefile.am
index 737f5344dd..8c4b25ab92 100644
--- a/test/freeflow/navierstokes/Makefile.am
+++ b/test/freeflow/navierstokes/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_navierstokes
test_navierstokes_SOURCES = test_navierstokes.cc
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
-noinst_HEADERS=*.hh
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+noinst_HEADERS:=$(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes/Makefile.am b/test/freeflow/stokes/Makefile.am
index 3641fe5801..647fb2fdd5 100644
--- a/test/freeflow/stokes/Makefile.am
+++ b/test/freeflow/stokes/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_stokes
test_stokes_SOURCES = test_stokes.cc
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
-noinst_HEADERS=*.hh
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+noinst_HEADERS:=$(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2c/Makefile.am b/test/freeflow/stokes2c/Makefile.am
index 2933ee07bb..7c0fc68fa9 100644
--- a/test/freeflow/stokes2c/Makefile.am
+++ b/test/freeflow/stokes2c/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_stokes2c
test_stokes2c_SOURCES = test_stokes2c.cc
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
-noinst_HEADERS=*.hh
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+noinst_HEADERS:=$(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2cni/Makefile.am b/test/freeflow/stokes2cni/Makefile.am
index 6e6ef0d292..59edff2117 100644
--- a/test/freeflow/stokes2cni/Makefile.am
+++ b/test/freeflow/stokes2cni/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_stokes2cni
test_stokes2cni_SOURCES = test_stokes2cni.cc
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
-noinst_HEADERS=*.hh
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+noinst_HEADERS:=$(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/test/geomechanics/el1p2c/Makefile.am b/test/geomechanics/el1p2c/Makefile.am
index a7509e7443..d989453768 100644
--- a/test/geomechanics/el1p2c/Makefile.am
+++ b/test/geomechanics/el1p2c/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_el1p2c
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_el1p2c_SOURCES = test_el1p2c.cc
diff --git a/test/geomechanics/el2p/Makefile.am b/test/geomechanics/el2p/Makefile.am
index 71266fd819..04f70f8592 100644
--- a/test/geomechanics/el2p/Makefile.am
+++ b/test/geomechanics/el2p/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_el2p
-noinst_HEADERS = *.hh
-EXTRA_DIST= grids/*.dgf co2values.inc CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST= grids/$(wildcard *.dgf) co2values.inc CMakeLists.txt
test_el2p_SOURCES = test_el2p.cc
diff --git a/test/geomechanics/elastic/Makefile.am b/test/geomechanics/elastic/Makefile.am
index f73d1b0256..ca86e26716 100644
--- a/test/geomechanics/elastic/Makefile.am
+++ b/test/geomechanics/elastic/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_elastic
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_elastic_SOURCES = test_elastic.cc
diff --git a/test/implicit/1p/CMakeLists.txt b/test/implicit/1p/CMakeLists.txt
index e9b26256a3..e3d8ba9d9b 100644
--- a/test/implicit/1p/CMakeLists.txt
+++ b/test/implicit/1p/CMakeLists.txt
@@ -41,3 +41,5 @@ add_dumux_test(test_cc1pwithamg test_cc1pwithamg test_cc1pwithamg.cc
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/test_1p_2d.dgf
-TimeManager.TEnd 1
-TimeManager.DtInitial 1)
+
+add_dune_alugrid_flags(test_cc1pwithamg test_box1pwithamg)
diff --git a/test/implicit/1p/Makefile.am b/test/implicit/1p/Makefile.am
index 7edde9a77b..e0ebbbea43 100644
--- a/test/implicit/1p/Makefile.am
+++ b/test/implicit/1p/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box1p test_cc1p test_box1pwithamg test_cc1pwithamg
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box1p_SOURCES = test_box1p.cc
test_cc1p_SOURCES = test_cc1p.cc
diff --git a/test/implicit/1p2c/Makefile.am b/test/implicit/1p2c/Makefile.am
index 3c837ae392..6677ec9471 100644
--- a/test/implicit/1p2c/Makefile.am
+++ b/test/implicit/1p2c/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box1p2c test_cc1p2c
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box1p2c_SOURCES = test_box1p2c.cc
test_cc1p2c_SOURCES = test_cc1p2c.cc
diff --git a/test/implicit/2p/Makefile.am b/test/implicit/2p/Makefile.am
index efbded3b0e..226d72707a 100644
--- a/test/implicit/2p/Makefile.am
+++ b/test/implicit/2p/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box2p test_cc2p
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2p_SOURCES = test_box2p.cc
test_cc2p_SOURCES = test_cc2p.cc
diff --git a/test/implicit/2p2c/Makefile.am b/test/implicit/2p2c/Makefile.am
index 154c2cfee3..eb969643d2 100644
--- a/test/implicit/2p2c/Makefile.am
+++ b/test/implicit/2p2c/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box2p2c test_cc2p2c
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2p2c_SOURCES = test_box2p2c.cc
test_cc2p2c_SOURCES = test_cc2p2c.cc
diff --git a/test/implicit/2p2cni/Makefile.am b/test/implicit/2p2cni/Makefile.am
index c7e02dbabb..9d151957e6 100644
--- a/test/implicit/2p2cni/Makefile.am
+++ b/test/implicit/2p2cni/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box2p2cni test_cc2p2cni
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2p2cni_SOURCES = test_box2p2cni.cc
test_cc2p2cni_SOURCES = test_cc2p2cni.cc
diff --git a/test/implicit/2pdfm/Makefile.am b/test/implicit/2pdfm/Makefile.am
index 698c065450..0ce2fb6954 100644
--- a/test/implicit/2pdfm/Makefile.am
+++ b/test/implicit/2pdfm/Makefile.am
@@ -2,7 +2,7 @@ check_PROGRAMS = test_2pdfm
test_2pdfm_SOURCES = test_2pdfm.cc
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/2pdfmartmesh.net CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/2pdfmartmesh.net CMakeLists.txt
include $(top_srcdir)/am/global-rules
diff --git a/test/implicit/2pni/Makefile.am b/test/implicit/2pni/Makefile.am
index 87ab48096d..1669644787 100644
--- a/test/implicit/2pni/Makefile.am
+++ b/test/implicit/2pni/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box2pni test_cc2pni
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2pni_SOURCES = test_box2pni.cc
test_cc2pni_SOURCES = test_cc2pni.cc
diff --git a/test/implicit/3p/Makefile.am b/test/implicit/3p/Makefile.am
index 9c03555b26..03a838e965 100644
--- a/test/implicit/3p/Makefile.am
+++ b/test/implicit/3p/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box3p test_cc3p
-noinst_HEADERS = *.hh
-EXTRA_DIST = *.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box3p_SOURCES = test_box3p.cc
test_cc3p_SOURCES = test_cc3p.cc
diff --git a/test/implicit/3p3c/Makefile.am b/test/implicit/3p3c/Makefile.am
index cce4c2b7a0..3a6ac245ef 100644
--- a/test/implicit/3p3c/Makefile.am
+++ b/test/implicit/3p3c/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box3p3c test_cc3p3c
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box3p3c_SOURCES = test_box3p3c.cc
test_cc3p3c_SOURCES = test_cc3p3c.cc
diff --git a/test/implicit/3p3cni/Makefile.am b/test/implicit/3p3cni/Makefile.am
index ff082e3b3d..6dd6023019 100644
--- a/test/implicit/3p3cni/Makefile.am
+++ b/test/implicit/3p3cni/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_box3p3cni test_cc3p3cni
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box3p3cni_SOURCES = test_box3p3cni.cc
test_cc3p3cni_SOURCES = test_cc3p3cni.cc
diff --git a/test/implicit/co2/Makefile.am b/test/implicit/co2/Makefile.am
index fd3e2b764d..55bae0c9d4 100644
--- a/test/implicit/co2/Makefile.am
+++ b/test/implicit/co2/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_boxco2 test_ccco2
-noinst_HEADERS = *.hh
-EXTRA_DIST = CMakeLists.txt *.input grids/*.dgf co2values.inc
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST = CMakeLists.txt $(wildcard *.input) grids/$(wildcard *.dgf) co2values.inc
test_boxco2_SOURCES = test_boxco2.cc
test_ccco2_SOURCES = test_ccco2.cc
diff --git a/test/implicit/co2ni/Makefile.am b/test/implicit/co2ni/Makefile.am
index 1ef28857dc..220004fbba 100644
--- a/test/implicit/co2ni/Makefile.am
+++ b/test/implicit/co2ni/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_boxco2ni test_ccco2ni
-noinst_HEADERS = *.hh
-EXTRA_DIST = CMakeLists.txt *.input grids/*.dgf co2values.inc
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST = CMakeLists.txt $(wildcard *.input) grids/$(wildcard *.dgf) co2values.inc
test_boxco2ni_SOURCES = test_boxco2ni.cc
test_ccco2ni_SOURCES = test_ccco2ni.cc
diff --git a/test/implicit/mpnc/Makefile.am b/test/implicit/mpnc/Makefile.am
index 30c22237bb..e4bb25b035 100644
--- a/test/implicit/mpnc/Makefile.am
+++ b/test/implicit/mpnc/Makefile.am
@@ -1,9 +1,9 @@
check_PROGRAMS = test_boxmpnc test_ccmpnc test_forchheimer2p test_forchheimer1p test_boxmpnckinetic test_boxmpncthermalnonequil
-noinst_HEADERS = *.hh
+noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST= *.input CMakeLists.txt grids/*.dgf
+EXTRA_DIST:= $(wildcard *.input) CMakeLists.txt grids/$(wildcard *.dgf)
gridsdir=$(datadir)/dumux/grids
-grids_DATA=grids/*.dgf
+grids_DATA=grids/$(wildcard *.dgf)
test_boxmpnc_SOURCES = test_boxmpnc.cc
test_ccmpnc_SOURCES = test_ccmpnc.cc
diff --git a/test/implicit/richards/Makefile.am b/test/implicit/richards/Makefile.am
index 33f71e693e..0055894ea1 100644
--- a/test/implicit/richards/Makefile.am
+++ b/test/implicit/richards/Makefile.am
@@ -1,7 +1,7 @@
check_PROGRAMS = test_boxrichards test_ccrichards
-noinst_HEADERS = *.hh
-EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_boxrichards_SOURCES = test_boxrichards.cc
test_ccrichards_SOURCES = test_ccrichards.cc
diff --git a/test/material/fluidsystems/Makefile.am b/test/material/fluidsystems/Makefile.am
index 224d146956..bb85a58035 100644
--- a/test/material/fluidsystems/Makefile.am
+++ b/test/material/fluidsystems/Makefile.am
@@ -3,5 +3,5 @@ check_PROGRAMS = test_fluidsystems
test_fluidsystems_SOURCES = test_fluidsystems.cc
EXTRA_DIST=CMakeLists.txt
-noinst_HEADERS=*.hh
+noinst_HEADERS:=$(wildcard *.hh)
include $(top_srcdir)/am/global-rules
diff --git a/test/multidomain/2cnistokes2p2cni/Makefile.am b/test/multidomain/2cnistokes2p2cni/Makefile.am
index 6b61bf2a6d..479381d038 100644
--- a/test/multidomain/2cnistokes2p2cni/Makefile.am
+++ b/test/multidomain/2cnistokes2p2cni/Makefile.am
@@ -8,8 +8,8 @@ headercheck_IGNORE = \
stokes2cnisubproblem.hh
endif
-noinst_HEADERS = *.hh
-EXTRA_DIST = *.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_2cnistokes2p2cni_SOURCES = test_2cnistokes2p2cni.cc
diff --git a/test/multidomain/2cstokes2p2c/Makefile.am b/test/multidomain/2cstokes2p2c/Makefile.am
index 5c84c7f685..4d15b0e3b1 100644
--- a/test/multidomain/2cstokes2p2c/Makefile.am
+++ b/test/multidomain/2cstokes2p2c/Makefile.am
@@ -8,8 +8,8 @@ headercheck_IGNORE = \
stokes2csubproblem.hh
endif
-noinst_HEADERS = *.hh
-EXTRA_DIST = *.input grids/*.dgf CMakeLists.txt
+noinst_HEADERS := $(wildcard *.hh)
+EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_2cstokes2p2c_SOURCES = test_2cstokes2p2c.cc
diff --git a/test/references/Makefile.am b/test/references/Makefile.am
index b280e649ca..ef80291561 100644
--- a/test/references/Makefile.am
+++ b/test/references/Makefile.am
@@ -1,4 +1,4 @@
referencesdir = $(includedir)/test/references
-EXTRA_DIST=*.vtu
+EXTRA_DIST:=$(wildcard *.vtu)
include $(top_srcdir)/am/global-rules
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 02d98fb7bd..41262b4222 100644
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -1,7 +1,7 @@
# programs just to build when "make check" is used
check_PROGRAMS = tutorial_decoupled tutorial_coupled
-noinst_HEADERS = *.hh
+noinst_HEADERS := $(wildcard *.hh)
tutorialdir = $(datadir)/tutorial
@@ -10,12 +10,12 @@ tutorial_decoupled_SOURCES = tutorial_decoupled.cc
tutorial_coupled_SOURCES = tutorial_coupled.cc
EXTRA_DIST = \
- CMakeLists.txt *.input \
- solutions_coupled/*.hh \
- solutions_coupled/*.diff \
- solutions_coupled/*.input \
- solutions_decoupled/*.hh \
- solutions_decoupled/*.diff \
- solutions_decoupled/*.input
+ CMakeLists.txt $(wildcard *.input) \
+ solutions_coupled/$(wildcard *.hh) \
+ solutions_coupled/$(wildcard *.diff) \
+ solutions_coupled/$(wildcard *.input) \
+ solutions_decoupled/$(wildcard *.hh) \
+ solutions_decoupled/$(wildcard *.diff) \
+ solutions_decoupled/$(wildcard *.input)
include $(top_srcdir)/am/global-rules
--
GitLab