From 65ad3bac9e7530c231fc2ce7c9add905a099d174 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch <bernd@iws.uni-stuttgart.de> Date: Thu, 16 Oct 2014 12:04:27 +0000 Subject: [PATCH] [buildsystem] fix remaining occurrences of "folder/$(wildcard" Approved by natalies. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13506 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- doc/Makefile.am | 2 +- doc/doxygen/Makefile.am | 2 +- test/implicit/mpnc/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index be6fd569e4..4791113862 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,7 +6,7 @@ CURDIR=doc # relative to $(CURDIR) BASEDIR=.. -EXTRA_DIST = logo/$(wildcard *.eps) \ +EXTRA_DIST = $(wildcard logo/*.eps) \ CMakeLists.txt include $(top_srcdir)/am/webstuff diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am index 3322b0b943..aa5a3e8576 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/$(wildcard *.png) extradoc/parameterlist extradoc/parameters.html CMakeLists.txt +EXTRA_DIST = $(PAGES) mainpage modules $(wildcard images/*.png) extradoc/parameterlist extradoc/parameters.html CMakeLists.txt include $(top_srcdir)/am/doxygen include $(top_srcdir)/am/global-rules diff --git a/test/implicit/mpnc/Makefile.am b/test/implicit/mpnc/Makefile.am index 59aa84ba03..6a6dda97f3 100644 --- a/test/implicit/mpnc/Makefile.am +++ b/test/implicit/mpnc/Makefile.am @@ -3,7 +3,7 @@ noinst_HEADERS := $(wildcard *.hh) EXTRA_DIST:= $(wildcard *.input) CMakeLists.txt $(wildcard grids/*.dgf) gridsdir=$(datadir)/dumux/grids -grids_DATA=grids/$(wildcard *.dgf) +grids_DATA=$(wildcard grids/*.dgf) test_boxmpnc_SOURCES = test_boxmpnc.cc test_ccmpnc_SOURCES = test_ccmpnc.cc -- GitLab