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
SUBDIRS = 1p 2p 2pia 3p mp
fluidmatrixinteractionsdir = $(includedir)/dumux/material/fluidmatrixinteractions
fluidmatrixinteractions_HEADERS = *.hh
fluidmatrixinteractions_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
mpdir = $(includedir)/dumux/material/fluidmatrixinteractions/Mp
mp_HEADERS = *.hh
mp_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
fluidstatesdir = $(includedir)/dumux/material/fluidstates
fluidstates_HEADERS = *.hh
fluidstates_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
fluidsystemsdir = $(includedir)/dumux/material/fluidsystems
fluidsystems_HEADERS = *.hh
fluidsystems_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
spatialparamsdir = $(includedir)/dumux/material/spatialparams
spatialparams_HEADERS = *.hh
spatialparams_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
2cnistokes2p2cnidir = $(includedir)/dumux/multidomain/2cnistokes2p2cni
2cnistokes2p2cni_HEADERS = *.hh
2cnistokes2p2cni_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = 2cnistokes2p2cnilocaloperator.hh
......
2cstokes2p2cdir = $(includedir)/dumux/multidomain/2cstokes2p2c
2cstokes2p2c_HEADERS = *.hh
2cstokes2p2c_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = \
......
commondir = $(includedir)/dumux/multidomain/common
common_HEADERS = *.hh
common_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = \
......
couplinglocalresidualsdir = $(includedir)/dumux/multidomain/couplinglocalresiduals
couplinglocalresiduals_HEADERS = *.hh
couplinglocalresiduals_HEADERS := $(wildcard *.hh)
if !HAVE_DUNE_MULTIDOMAIN
headercheck_IGNORE = \
......
nonlineardir = $(includedir)/dumux/nonlinear
nonlinear_HEADERS = *.hh
nonlinear_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
paralleldir = $(includedir)/dumux/parallel
parallel_HEADERS = *.hh
parallel_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules
patchesdir = $(includedir)/patches
EXTRA_DIST=*.patch README
EXTRA_DIST:=$(wildcard *.patch) README
include $(top_srcdir)/am/global-rules
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
......
# 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
......
......@@ -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
......
# 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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
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