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
...@@ -5,7 +5,7 @@ EXTRA_DIST = \ ...@@ -5,7 +5,7 @@ EXTRA_DIST = \
bin/fuzzycomparevtu.py \ bin/fuzzycomparevtu.py \
bin/runTest.sh \ bin/runTest.sh \
cmake/modules/CMakeLists.txt \ cmake/modules/CMakeLists.txt \
cmake/modules/*.cmake \ cmake/modules/$(wildcard *.cmake) \
CMakeLists.txt \ CMakeLists.txt \
config.h.cmake \ config.h.cmake \
INSTALL.cmake \ INSTALL.cmake \
......
...@@ -139,7 +139,9 @@ AC_CONFIG_FILES([dumux.pc ...@@ -139,7 +139,9 @@ AC_CONFIG_FILES([dumux.pc
]) ])
# implicitly set the Dune-flags everywhere # 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" ) AC_SUBST(AM_LDFLAGS, "$ALL_PKG_LDFLAGS" )
LIBS="$DUNE_LIBS $ALL_PKG_LIBS" LIBS="$DUNE_LIBS $ALL_PKG_LIBS"
......
...@@ -6,7 +6,7 @@ CURDIR=doc ...@@ -6,7 +6,7 @@ CURDIR=doc
# relative to $(CURDIR) # relative to $(CURDIR)
BASEDIR=.. BASEDIR=..
EXTRA_DIST = logo/*.eps EXTRA_DIST = logo/$(wildcard *.eps)
include $(top_srcdir)/am/webstuff include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
...@@ -4,7 +4,7 @@ CURDIR=doc/doxygen ...@@ -4,7 +4,7 @@ CURDIR=doc/doxygen
# add some more stuff to install and tarball # add some more stuff to install and tarball
DOCFILES = $(PAGES) 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/doxygen
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
......
if BUILD_HANDBOOK if BUILD_HANDBOOK
TEXSOURCE = *.tex TEXSOURCE := $(wildcard *.tex)
MAINDOCS = dumux-handbook.pdf MAINDOCS = dumux-handbook.pdf
DOCS = $(HTDOCS) $(MAINDOCS) DOCS = $(HTDOCS) $(MAINDOCS)
...@@ -11,8 +11,8 @@ CURDIR=doc/handbook ...@@ -11,8 +11,8 @@ CURDIR=doc/handbook
handbookdir=$(docdir)/handbook handbookdir=$(docdir)/handbook
handbook_DATA = dumux-handbook.pdf handbook_DATA = dumux-handbook.pdf
CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps CLEANFILES := $(wildcard *.aux) $(wildcard *.bbl) $(wildcard *.blg) $(wildcard *.log) $(wildcard *.out) $(wildcard *.toc) $(wildcard *.dvi) $(wildcard *.ps)
CLEANFILES += *.4ct *.4tc *.css *.idv *.idx *.lg *.tid *.tmp *.tms *.xref CLEANFILES +:= $(wildcard *.4ct) $(wildcard *.4tc) $(wildcard *.css) $(wildcard *.idv) $(wildcard *.idx) $(wildcard *.lg) $(wildcard *.tid) $(wildcard *.tmp) $(wildcard *.tms) $(wildcard *.xref)
CLEANFILES += $(DOCS) CLEANFILES += $(DOCS)
doc: $(TEXSOURCE) doc: $(TEXSOURCE)
......
commondir = $(includedir)/dumux/common commondir = $(includedir)/dumux/common
common_HEADERS = *.hh common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
SUBDIRS = diffusion SUBDIRS = diffusion
1pdir = $(includedir)/dumux/decoupled/1p 1pdir = $(includedir)/dumux/decoupled/1p
1p_HEADERS = *.hh 1p_HEADERS := $(wildcard *.hh)
......
SUBDIRS = fv SUBDIRS = fv
diffusiondir = $(includedir)/dumux/decoupled/1p/diffusion diffusiondir = $(includedir)/dumux/decoupled/1p/diffusion
diffusion_HEADERS = *.hh diffusion_HEADERS := $(wildcard *.hh)
......
fvdir = $(includedir)/dumux/decoupled/1p/diffusion/fv fvdir = $(includedir)/dumux/decoupled/1p/diffusion/fv
fv_HEADERS = *.hh fv_HEADERS := $(wildcard *.hh)
......
SUBDIRS = diffusion impes transport SUBDIRS = diffusion impes transport
2pdir = $(includedir)/dumux/decoupled/2p 2pdir = $(includedir)/dumux/decoupled/2p
2p_HEADERS = *.hh 2p_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
SUBDIRS = fv fvmpfa mimetic SUBDIRS = fv fvmpfa mimetic
diffusiondir = $(includedir)/dumux/decoupled/2p/diffusion diffusiondir = $(includedir)/dumux/decoupled/2p/diffusion
diffusion_HEADERS = *.hh diffusion_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
fvdir = $(includedir)/dumux/decoupled/2p/diffusion/fv fvdir = $(includedir)/dumux/decoupled/2p/diffusion/fv
fv_HEADERS = *.hh fv_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
lmethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/lmethod lmethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/lmethod
lmethod_HEADERS = *.hh lmethod_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
omethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/omethod omethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/omethod
omethod_HEADERS = *.hh omethod_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
mimeticdir = $(includedir)/dumux/decoupled/2p/diffusion/mimetic mimeticdir = $(includedir)/dumux/decoupled/2p/diffusion/mimetic
mimetic_HEADERS = *.hh mimetic_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
impesdir = $(includedir)/dumux/decoupled/2p/impes impesdir = $(includedir)/dumux/decoupled/2p/impes
impes_HEADERS = *.hh impes_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
SUBDIRS = fv SUBDIRS = fv
transportdir = $(includedir)/dumux/decoupled/2p/transport transportdir = $(includedir)/dumux/decoupled/2p/transport
transport_HEADERS = *.hh transport_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
fvdir = $(includedir)/dumux/decoupled/2p/transport/fv fvdir = $(includedir)/dumux/decoupled/2p/transport/fv
fv_HEADERS = *.hh fv_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
2p2cdir = $(includedir)/dumux/decoupled/2p2c 2p2cdir = $(includedir)/dumux/decoupled/2p2c
2p2c_HEADERS = *.hh 2p2c_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
SUBDIRS = fv mimetic SUBDIRS = fv mimetic
commondir = $(includedir)/dumux/decoupled/common commondir = $(includedir)/dumux/decoupled/common
common_HEADERS = *.hh common_HEADERS := $(wildcard *.hh)
include $(top_srcdir)/am/global-rules 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