Commit eed0fd31 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[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
parent f3ecfd37
......@@ -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
......
referencesdir = $(includedir)/test/references
EXTRA_DIST=*.vtu
EXTRA_DIST:=$(wildcard *.vtu)
include $(top_srcdir)/am/global-rules
# 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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment