diff --git a/Makefile.am b/Makefile.am
index 26a545db393fa6ccd300ef43da2cdd714097160c..da3952590bccb527d0781e227d8a1890dc4d6c57 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 3683cf0f1520f0ce7ad902107a995255e66e1075..2f80484a5cc600efea82a3ee207b94fc337c3eed 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 602b54fa5ee83cf5eee32bb87e191ca7a48af3b4..e316c488ee03460dfc00dae42ddd5adfc9049072 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 5f2110cfc76bb4edd81e6fb1a89a28ae8ffcb0f1..780b703f6bb249420854f12a960c5d9c9213df9f 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 24e89873660aa92b6332eac837c60e65a42f59d3..5aeeee4d85f1aada9b538981fcac5bcb21b78cd8 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 0d88b82ce6d279a78919b7f017aa84d7098d8d98..724029d2df77fe1db9c4f5f0308b27c06cd4e622 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 62e85dc8620477fc2552f132bf397e9ce3a42175..b745eb839a12c3fbff7110be8c1a3b726f96e606 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 2ca7d2cf25d9e2dd47b9a8a0af9df5df50395439..c1ad482e94daa6aeae6a14606505c4fc4db650e2 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 c36d4c27262307798c8620300ed9ae93832c25d1..d2e79854696763e92750a26b75ef58682904534f 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 1443f48ae2995bd80987ee41025541504b7667e6..55a6ca0a29505c2d5eb6d37cd4dec3b0330335d4 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 b38a180ec79585d25ae39399ff7572b483ad0e5e..75347619ad7daab393ca58df6cceee96ce699460 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 9609dfd01735ea5e6efa0546156b381c561eebbd..c50008b4e19336f59115cd4777353363d71310d9 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 e57741583bcd4c370df2934a8ce0d987cf7e35a4..020a8b528c0f159083c8c7c39b5492740153c3e9 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 c1a2de33093d85583978c2f90070eb4108b3cb73..5893b3bf4e4b45e067b74493248710c8be3d5f6e 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 56d2911c7c7068109f3a78c3bd43557832b2d982..dfbe2daf3a1532d043953d9514829a8515db5783 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 5a008c5c20ff49e13743afd46944f3219295906a..b53c00cbb835751878b131175c116adee51628de 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 c0a7e0d4d0be8d865feadb51573f21c0197786eb..35e9f2ec214f916a1e1f752034976dfdb2fc1067 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 0edf20b0fe021cb1b457cd83cbe1dcf8925c7f8f..a815c62a5c95ce557fd7400ed84fb40545dafcc6 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 5433c454264f816641a63251a5435f8b53fb5206..64c1c3245a9649de96914b61e747e25ad9300b66 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 ae5189bf2fd91c906ec8e4b385a0b7dfa32ab96d..2603105db557df048324396cd6fb6824ef741f1f 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 e4d9d12185fd2c5baca1ea68fd9f2afba09ea6b5..a610bf78348ca7e1138c3da63199438939653d88 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 bbe7eb523d7bd0debc764676d3ac0d45a975db4c..95f3c6096a4fc8d34a341f7b04369323a2c1ffcf 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 ce9aade52122f7e466a4c30254bdcc12359ee493..8c989a611d13f5414c2518d589434928ebc1e066 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 7cf63a30f312b962b9d46a0c4b5ae6b14a6aff3b..bb2b41527abbd4a6c7df6d2eae5590661aeaf060 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 f2cb676563e1a7d4d5e2cb67690e3b94db715655..e709ebacb172889b6c6c10677a525c3926300997 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 96b5373d6919aa4dea394fd3e4b5eadc5e828221..63f64e801b943cd6d702db1eeaf268ffc5e20124 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 0270b95bda5302c666da3a429be2e3ab9584de9c..d073abdc37fc17089314103e63f50e6b48522cff 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 852f360ea3dae272447597c0c2777c0a451a79a5..94d114c8c1cdead1975c2d184f60293fb0a8815d 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 1187acc51970ac8b58970b0f46c5cc0b459ca4ab..fa2bd32f6341e3c63d02a5bc201c5353dbeb6bc5 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 b7eca627746297bf17e4884690be693bff9d09ae..3f9dc05dfa48d3e1211594108e1256148486124f 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 76f7462a3f7828c9f50caf842b375a5d3ef375b9..63658c9cc9f7812baea0387f07dbd3687decc282 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 85973916fccbc7a50094a5e523a10f1c61ba27a5..8f38ebaedebcd5414e7c48b169aed33954d44a28 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 e4f87725e66bb304e18b820d43729da6940260e1..534d1460ea701e5bda016b8f7dfa3322bf882419 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 21d36f8026593f45c4ba89deadac842b8106ec5f..8fa2ae7c42315b387457e4059305b851f949b6c0 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 936fb690480921ea834a573bea24a6d9de677b44..8b2788d0613070ef4102fc037bbfe2b6fd1fb917 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 341609deb6b2efd1bac1a011f851d8f01092d6a3..62ed49a1405cbc952a66b654d64d78cb6ee889c5 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 f50519766e1830373a2442ae9461e83e039c2e7f..53b283d82658b83584ed163eb4ae4e8b6f27d68d 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 dd384df9a45c919760c4271b307095824632a6ac..a80d2ee979e3f4e382b66de7f033ead2fe5d65d6 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 4c5b3ec71e1b74fc7de6e2e484eef3179d38afb7..c960520f8b1db14ab45fec83bac3e7fca8cf5c81 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 27c0a4d5a3ac98ea7101ee07d80cb4a7a38348d8..16781341e054d37911de7e164e88f3b8e43da1b6 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 79882bb6f4ed3815f31d813994b303375de6954a..5102a0f1ee605cb87c75a538b6bbb89d5d74e25f 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 168bc5e1665d6c7a3d5ba03d15cb5062f2380a1d..addfd9db7d8847e59e782fe0c76217e3a73d2cd6 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 bf8622f6c5e4549c0b958ec019dbcaa690da2351..84015b26f806823ba88bba0e1d8283110a9c55a9 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 27c0a4d5a3ac98ea7101ee07d80cb4a7a38348d8..16781341e054d37911de7e164e88f3b8e43da1b6 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 f6e46bb5e575ecc94d773dbae923a35d7c096079..5323ace079901c6df09465c022e2646b0104b42c 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 cd3f739c410ceddcd628087b8d76f01f32bf2feb..7a84c28cbeeb5b51dc98e0aa4c49f87c82f5699b 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 340ad53b2d8c0373914c89cd7bcfe2bb298f38d3..e53d013761939d1a3a3d85e30a52c5cfc601f6e3 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 79d93ab0a837918f49c27ed2def62e28f64c4c04..3f37abca5bd9ed6a2ae1ff48b4c58bb3c32e3657 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 e3639f38e933e868144a995012ca7aeab3929952..db507617bb8291b70a8734d5cbe4b8e8ef6c4a89 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 dedcf10ab550ca6cb315ac8bbba7124b9254b780..1f2bddeccb8961aca2f91c538705e121d73df4f7 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 6b9f52209c565963eaf55f972c6679b53c8566f1..1dc6fcd0ef5c7b2fef7e1aae6688019e10d2133c 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 7e8d7cf2a61f9762dd4b07248a647a4d09ea16f7..4db89a516a4f91da93aaba866d021165c23abd7f 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 18677c25b1291cc9f5f7050f72387060c5bd80a6..d7ae0339c2f0f44ec8d0579236e68d6322084fb8 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 a45229b952d7f5021a4434704e1b8cc38d601a5d..7314782e4f7c8ba974ee5a862b36752077a475f5 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 f3ea40c469183f7fd3e3fbfeb201f962d0c06553..a42f5911db7c6532ddfad6e8d7aca2f99b3881ab 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 fbcaa287aaa3172a3f11dd1c390372b5a529b180..f67a082ef6a6a65f72325de1edb3a617eda7431a 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 4b728c1730572686a49678183ad45201030be186..0911206176e289e1008efd15f6d648815ddf265b 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 68a6185f90c1362e4ec017192170715c3ebd45e9..9def07699830b669916a16003c9e2ce7bf03fd52 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 bf2867314ce1283b4091e1c293a90ed07986d2bb..58879d6bbe1d0eb5d168c44ddc3698e099bb9d3b 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 ecd25a1e9fba2c2036e6cb8816ab9b3deb4de8d5..67c57ef61b6bff5c4cc455329850d75189cf60ba 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 d3c3e3ce04f8700274facbef8c3b54975c0c0a7c..832bf3d08c6d9974383f72fd384067d420a639d2 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 bb1d1376be8e0af049dc53b328a9d608483ceff3..65a60a29fb090d122c98e4ff72b291c370adb160 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 46d4e003b7842737ad5cd1c2f750a12f1204affb..8fc80956e066e66b09d3df281c39be989124e438 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 fc6f9a87b53597ca8d43ffc3e7a8920c358a5611..e7ad6b21c1b3750a904bc068c4e7f9effce10032 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 b7849a45ab8cd54dfe9af103e450e50c00407247..d0ad304b8195799a40cf790f822fe7ac10b188b1 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 003f38efe6c4c8664289e969085b5812df43d4bc..86dccb3d53401df9f04e6ca5680b687faeb2d1e2 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 347b9a51481119589d025e63a9024026029f43d3..345c1ed6b8f36ceaca5cb45e64704543a9c62936 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 ada66d91e8fdd95a6af4997da72d0551fef906d2..1f03763b6f3a11ca68ec98ff8bc9c53779d0a36e 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 ba47b957357a64085d717b002ff5447f26bf53aa..da7e2d2ad526f54d25b4a4aec16979ada9b3251c 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 0820938aef2bbedf7451335a312819150c160720..bc3a909021bd1a5f1b12b6e3b0290d2d4a5b8aab 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 0ddf4672697fd2fa8ccc9a9edf47c2c779d6faee..5691897887d3cd440e03df2ed2b2313bf6ab52f7 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 df940a5d9c705b34833e6b3b285844c287e6252f..e3c92a9287d066767cc03ba9504c742a922c2073 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 73d20db662a5ea0eccfdd752199e2cf676bd8c8f..d66c32d0ea30e0a550a1491f3a74a127e53198b5 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 5f203dfb01a152a63ac14611c740d33386ee64e0..50205282195ecaa428d03d12f0862288f006ea40 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 bc411f884463d1c5d8186c2396fec31d3bdb4b5d..daae274ae01365d8be7cb775313fb9a751c8067a 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 fa045ae9cfcc41851715eb7f4dd22ddc344c8907..afa0a40a8eaec53b2365e705a03915120f08c064 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 737f5344ddf04bf6ad20b053ce48261ff9dd1956..8c4b25ab92de3ae18a6fd81087eb32bfd1e04312 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 3641fe58010aa2149b70af35cf53355b6fbc4cc1..647fb2fdd5c502e29cf1f718da21c9dcec679244 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 2933ee07bbe318e2e1075a48751ac78f4a2ccf64..7c0fc68fa934e535c58da2f4b35165730ffead40 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 6e6ef0d2926f99cdcb8f632b5d5a3c474d48edf1..59edff211709371380c0323e8072adcd547d4311 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 a7509e7443408c6befff411d9197e2ca6d9eb260..d9894537683084a2acafe2541217ead80aaa6654 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 71266fd819c1aed27faec67420a53a310a2e19f9..04f70f8592c3a1da2cc4e68bf19d0cef878493b1 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 f73d1b0256546fc1bba527f2b008c0ef0fb20e04..ca86e26716bc395a9ceffeafd7897a0b6d77118f 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 e9b26256a3baa25b723bc95c6a53a487bf405ed0..e3d8ba9d9b02aec5b1b5b5a644b0bea103b9777b 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 7edde9a77bbd05df84e9d0f3df4600d027231836..e0ebbbea4348f5dc3e1de0f401408bb2cc87b2d7 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 3c837ae39250893b6ae4af415e3d4518c20bfc65..6677ec94714c33a4900efebfd524a8e918ce5cbd 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 efbded3b0ea16e7779c9fed562188392808705fc..226d72707ac5fb4c12cbafdd3120ad6763d1a859 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 154c2cfee312da8ed375e8b61477c41600a28b69..eb969643d285f36c7fd43a1ec77e62baa052b834 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 c7e02dbabb4cca809af72dcac91f611fc88770a2..9d151957e6925ec683d92347335414eb37079116 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 698c06545016fda5c72fce1acb893761c1b288c1..0ce2fb69548962032a167f61f4c5bbc677575460 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 87ab48096d2d387a4fd8a2b2f586113598c888c9..1669644787097b96a2b3b36d27f1ff4d95e00b9a 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 9c03555b26f87b44351f71728a50662df68113f6..03a838e965827972f0a94e5c583484880b6451c8 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 cce4c2b7a0a11742a3db102fa691a88e8fad03e0..3a6ac245efc438e1359a9f5efd19d6a0dc4e1d4a 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 ff082e3b3d9693b33f9555a0b8ad74f4a2d7cabd..6dd60230190308e261798a1052ec72595f997280 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 fd3e2b764d82c9dcd3899931e3e68da88a09305b..55bae0c9d4ef26830ac4dc0f743cfa69536aebb2 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 1ef28857dc62a2e03e897a97269c93e4a944b6a7..220004fbba351eb97e03b0dbf4932e95cabff428 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 30c22237bbe422ca5ec105784f9a893ab6969674..e4bb25b035acda068333644fca368970a62facc7 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 33f71e693ecb7c651b1a2626cd88a4493b107fb6..0055894ea1ef85e93ad7119781e26b27855412aa 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 224d146956136cb80f09d3a3566dcac6663e4874..bb85a5803501ae2acb0613b9b462685331791b63 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 6b61bf2a6d8ec8e27536efe368dc2cb710b7621a..479381d0388f1fdaf8fd673f80af10e8ba50010a 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 5c84c7f685c24d6999f0e91835d215da8c524c13..4d15b0e3b13f1fe9e5c31e46efe20a5ad340de10 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 b280e649ca2837eb05cd37d5e3d6b3eff2afe78b..ef802915618b0a7011992b2353792ecdc6374d8c 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 02d98fb7bd4ee6cd993cbc5a2f7471daee6eb178..41262b42223b963d492e58fb93f4952e60112e19 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