From f296791d88aca825b6c0e582ee79347f2abcc61b Mon Sep 17 00:00:00 2001
From: Thimo Neubauer <thimo@dune-project.org>
Date: Tue, 19 Oct 2004 10:48:01 +0000
Subject: [PATCH] got istl-dist working
[[Imported from SVN: r928]]
---
istl/.gitignore | 3 ++-
istl/Makefile.am | 12 +++++++++++-
istl/README.istl-dist | 4 ++++
istl/doc/.gitignore | 3 ++-
istl/istlexception.hh | 2 +-
istl/tutorial/Makefile.istl-dist | 5 +++++
6 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 istl/README.istl-dist
create mode 100644 istl/tutorial/Makefile.istl-dist
diff --git a/istl/.gitignore b/istl/.gitignore
index 55880268f..677993cc4 100644
--- a/istl/.gitignore
+++ b/istl/.gitignore
@@ -1,3 +1,4 @@
Makefile
Makefile.in
-semantic.cache
\ No newline at end of file
+semantic.cache
+istl.tar.gz
\ No newline at end of file
diff --git a/istl/Makefile.am b/istl/Makefile.am
index a697fc2ea..36a771b3c 100644
--- a/istl/Makefile.am
+++ b/istl/Makefile.am
@@ -2,7 +2,7 @@
SUBDIRS = doc tutorial
-SOURCES = allocator.hh basearray.hh bcrsmatrix.hh bvector.hh fmatrix.hh fvector.hh gsetc.hh io.hh istlexception.hh istl.hh precision.hh vbcrsmatrix.hh vbvector.hh
+SOURCES = allocator.hh basearray.hh bcrsmatrix.hh bvector.hh fmatrix.hh gsetc.hh io.hh istlexception.hh istl.hh precision.hh vbcrsmatrix.hh vbvector.hh ilu.hh operators.hh preconditioners.hh solvers.hh
istldir = $(includedir)/dune/istl
istl_HEADERS = $(SOURCES)
@@ -15,12 +15,22 @@ DISTDOCS = doc/istl.tex doc/istl.bib doc/istl.ps doc/istl.pdf
# same for tutorial
DISTTUT = tutorial/example.cc
+# parts from dune needed for istl (only common, please!)
+DUNESTUFF = common/exceptions.hh common/fvector.hh common/timer.hh
+
+# these files are copied into the distribution but with .istl-dist stripped
+RENAMESTUFF = README.istl-dist tutorial/Makefile.istl-dist
+
# more or less stolen from automake (a lot simpler though...)
istl-dist:
(cd doc && $(MAKE))
if test -e istl ; then echo Please remove `pwd`/istl!; exit 1; fi
$(mkdir_p) istl
cp --parents $(SOURCES) $(DISTDOCS) $(DISTTUT) istl
+ (cd $(top_srcdir) && cp --parents $(DUNESTUFF) istl/istl )
+ for NAME in $(RENAMESTUFF) ; do \
+ cp $$NAME istl/`dirname $$NAME`/`basename $$NAME .istl-dist`; \
+ done
$(AMTAR) chf - istl --format=posix | \
GZIP=$(GZIP_ENV) gzip -c > istl.tar.gz
rm -r istl
diff --git a/istl/README.istl-dist b/istl/README.istl-dist
new file mode 100644
index 000000000..e5cd25add
--- /dev/null
+++ b/istl/README.istl-dist
@@ -0,0 +1,4 @@
+To use ISTL you just have to add the new istl-directory and
+istl/common to your include-path, e.g.
+
+ g++ -I ~/istl -I ~/istl/common myprogram.cc
diff --git a/istl/doc/.gitignore b/istl/doc/.gitignore
index b257d73ee..3cc838d02 100644
--- a/istl/doc/.gitignore
+++ b/istl/doc/.gitignore
@@ -8,4 +8,5 @@
*.pdf
*.ps
Makefile
-Makefile.in
\ No newline at end of file
+Makefile.in
+semantic.cache
\ No newline at end of file
diff --git a/istl/istlexception.hh b/istl/istlexception.hh
index b36dea778..e483bc447 100644
--- a/istl/istlexception.hh
+++ b/istl/istlexception.hh
@@ -5,7 +5,7 @@
#include <stdlib.h>
-#include "../common/exceptions.hh"
+#include "exceptions.hh"
namespace Dune {
diff --git a/istl/tutorial/Makefile.istl-dist b/istl/tutorial/Makefile.istl-dist
new file mode 100644
index 000000000..cea55037b
--- /dev/null
+++ b/istl/tutorial/Makefile.istl-dist
@@ -0,0 +1,5 @@
+# $Id$
+
+CXXFLAGS = -I .. -I ../common
+
+all: example
--
GitLab