Commit 6c7233a7 authored by Markus Blatt's avatar Markus Blatt

Merged tarball creation fixes r117:122 from release.

[[Imported from SVN: r123]]
parents 88ccd9e7 2125aa82
This diff is collapsed.
......@@ -2,17 +2,23 @@
SUBDIRS = doc grids
noinst_HEADERS = elementdata.hh parfvdatahandle.hh unitcube_sgrid.hh \
examplesdir=$(datadir)/doc/dune-grid-howto/examples
examples_HEADERS = elementdata.hh parfvdatahandle.hh unitcube_sgrid.hh \
evolve.hh transportproblem2.hh unitcube_uggrid.hh \
finitevolumeadapt.hh transportproblem.hh unitcube_yaspgrid.hh \
functors.hh unitcube_albertagrid.hh vertexdata.hh \
initialize.hh unitcube_alugrid.hh vtkout.hh integrateentity.hh \
unitcube.hh parevolve.hh unitcube_onedgrid.hh
noinst_PROGRAMS = gettingstarted traversal integration othergrids\
examples_PROGRAMS = gettingstarted traversal integration othergrids\
adaptiveintegration finitevolume adaptivefinitevolume parfinitevolume\
visualization
examples_DATA = gettingstarted.cc traversal.cc integration.cc othergrids.cc \
adaptiveintegration.cc finitevolume.cc adaptivefinitevolume.cc \
parfinitevolume.cc visualization.cc
gettingstarted_SOURCES = gettingstarted.cc
gettingstarted_CXXFLAGS = $(MPI_CPPFLAGS) $(ALL_PKG_CPPFLAGS)
gettingstarted_LDADD = $(DUNE_LDFLAGS) $(DUNE_LIBS) $(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS) $(MPI_LDFLAGS)
......
DUNE-library
============
For a full explanation of the DUNE installation process please read
the installation notes [0]. The following introduction is meant for
the impatient.
Getting started
---------------
Suppose you have downloaded all DUNE modules of interest to you and
extracted then in one common directory. See [1] for a list of
available modules.
To compile the modules Dune has to check several components of
your system and whether prerequisites within the modules are met. For
the ease of users we have designed a custom build system on top of the
automake tools. Run
./dune-common/bin/dunecontrol all
to commence those tests and build all modules you have
downloaded. Don't worry about messages telling you that libraries are
missing: they are only needed for grid-self-checks we need for
developing.
You can customize the build to your specific needs by using an options file
./dune-common/bin/dunecontrol --opts=/path_to/file.opts
An example of an options file is
# use a special compiler (g++ version 3.4) and install to a custom
# directory, default is /usr/local/bin
CONFIGURE_FLAGS="CXX=g++-3.4 --prefix='/tmp/Hu Hu'"
# Set the default target of make to install. Now the call above will
# not just build the DUNE modules but also install it
MAKE_FLAGS=install
If you did not tell dunecontrol to install with an options file you
need to run
./dune-common/bin/dunecontrol make install
to install Dune (you may need root-permissions for the install
part depending on the prefix set)
A more comprehensive introduction to the build system can be found in [2].
License
-------
The Dune-library and headers are licensed under version 2 of the GNU
General Public License, with the so-called "runtime exception," as
follows:
As a special exception, you may use the DUNE source files as part of a
free software library without restriction. Specifically, if other
files instantiate templates or use macros or inline functions
from one or more of the DUNE source file, or you compile one or
more of the DUNE source files and link them with other files to
produce an executable, this the DUNE source files used do not by
themselves cause the resulting executable to be covered by the GNU
General Public License. This exception does not however invalidate
any other reasons why the executable file might be covered by
the GNU General Public License.
This licence clones the one of the libstc++ library. For further
implications of this library please see their licence page [3]
Links
-----
0. http://www.dune-project.org/doc/installation-notes.html
1. http://www.dune-project.org/download.html
2. http://dune-project.org/doc/buildsystem/buildsystem.pdf
3. http://gcc.gnu.org/onlinedocs/libstdc++/17_intro/license.html
# all eps files which are not part of the distribution
EPS_FILES = adaptiveintegration_alberta2d.eps adaptiveintegration_ug3d.eps \
alberta2d.eps alberta2d-view1.eps alberta2d-view2.eps alberta3d.eps \
alucube3d.eps alusimplex3d.eps conc.eps iso.eps ug2dquad-view1.eps \
ug2dquad-view2.eps ug2dtri-view1.eps ug2dtri-view2.eps ugcube2d.eps \
ugcube3d.eps ugsimplex2d.eps ugsimplex3d.eps yasp3d.eps
EXTRA_DIST = adaptiveintegration_alberta2d.jpg adaptiveintegration_ug3d.jpg \
alberta2d.jpg alberta2d-view1.jpg alberta2d-view2.jpg alberta3d.jpg \
alucube3d.jpg alusimplex3d.jpg conc.eps intersection.eps islocalref.eps \
iso.jpg partitionsingle.eps partitionsingle.svg ug2dquad-view1.jpg \
ug2dquad-view2.jpg ug2dtri-view1.jpg ug2dtri-view2.jpg ugcube2d.jpg \
ugcube3d.jpg ugsimplex2d.jpg ugsimplex3d.jpg yasp3d.jpg
if CONVERT
CLEANFILES = $(EPS_FILES)
all-am: $(EPS_FILES)
%.eps: $(srcdir)/%.jpg
convert $< $@
endif
include $(top_srcdir)/am/global-rules
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/latex
# $id: $
SUBDIRS = EPS
EPS_FILES = EPS/adaptiveintegration_alberta2d.eps EPS/adaptiveintegration_ug3d.eps \
EPS/alberta2d.eps EPS/alberta2d-view1.eps EPS/alberta2d-view2.eps EPS/alberta3d.eps \
EPS/alucube3d.eps EPS/alusimplex3d.eps EPS/conc.eps EPS/iso.eps EPS/ug2dquad-view1.eps \
EPS/ug2dquad-view2.eps EPS/ug2dtri-view1.eps EPS/ug2dtri-view2.eps EPS/ugcube2d.eps \
EPS/ugcube3d.eps EPS/ugsimplex2d.eps EPS/ugsimplex3d.eps EPS/yasp3d.eps
DOCSOURCE = grid-howto.tex navigation.html css.html
......@@ -15,7 +19,7 @@ if TEX4HT
endif
# EXTRA_DIST = $(DOCSOURCE) $(WMLDOCS) $(HTDOCS)
EXTRA_DIST = grid-howto.tex grid-howto.pdf
EXTRA_DIST = grid-howto.pdf
if BUILD_DOCS
if CONVERT
......@@ -28,9 +32,9 @@ endif
BASEDIR=../..
CURDIR=doc/grid-howto
docdir=$(datadir)/doc/dune/grid-howto
docdir=$(datadir)/doc/dune-grid-howto
doc_DATA = $(DOCS)
doc_DATA = grid-howto.pdf
EXTRAINSTALL = grid-howto.pdf grid-howto*.html *.png *.css
......@@ -38,6 +42,13 @@ CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
CLEANFILES += *.4ct *.4tc *.css *.idv *.idx *.lg *.tid *.tmp *.tms *.xref
CLEANFILES += grid-howto*.html grid-howto*.png
CLEANFILES += $(DOCS)
if CONVERT
CLEANFILES += $(EPS_FILES)
%.eps: $(srcdir)/%.jpg
convert $< $@
grid-howto.tex: $(EPS_FILES)
endif
grid-howto.html: $(DOCSOURCE)
$(MAKE) grid-howto.dvi
......@@ -45,6 +56,9 @@ grid-howto.html: $(DOCSOURCE)
$(T4HT) grid-howto.tex
$(TEX) grid-howto.tex
dist-hook:
cp $(srcdir)/Makefile.am.dist $(distdir)/Makefile.am
EXTRA_TEXINPUTS:=$(top_srcdir)
include $(top_srcdir)/am/global-rules
......
docdir=$(datadir)/doc/dune-grid-howto
doc_DATA = grid-howto.pdf
include $(top_srcdir)/am/global-rules
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/latex
Markdown is supported
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