From 31fa6de3ef6dfd9fc5226de7eb7097c99ecb72a3 Mon Sep 17 00:00:00 2001 From: Christian Engwer <christi@dune-project.org> Date: Sun, 4 Oct 2009 18:32:19 +0000 Subject: [PATCH] cleanup doc, adapt to changes (simplifications) in common [[Imported from SVN: r1095]] --- configure.ac | 12 ++---------- doc/.wmlrc | 3 --- doc/Makefile.am | 2 +- doc/doxygen/doxy-footer.html | 14 -------------- doc/doxygen/doxy-header.wml | 16 ---------------- doc/layout/.gitignore | 3 --- doc/layout/Makefile.am | 8 -------- doc/layout/default.wml | 21 --------------------- doc/layout/header.wml | 11 ----------- doc/layout/navigation.wml | 0 10 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 doc/.wmlrc delete mode 100644 doc/doxygen/doxy-footer.html delete mode 100644 doc/doxygen/doxy-header.wml delete mode 100644 doc/layout/.gitignore delete mode 100644 doc/layout/Makefile.am delete mode 100644 doc/layout/default.wml delete mode 100644 doc/layout/header.wml delete mode 100644 doc/layout/navigation.wml diff --git a/configure.ac b/configure.ac index 56b40b4c2..de7df9ff2 100644 --- a/configure.ac +++ b/configure.ac @@ -19,21 +19,11 @@ DUNE_AUTOBUILD_FLAGS AC_SUBST([AM_CPPFLAGS], '$(DUNE_CPPFLAGS) -I$(top_srcdir)') AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS) $(DUNE_LIBS)') -DUNE_SUMMARY_ALL - -echo -echo Note: Most of the libraries checked for above are only used for the self-test -echo of Dune. The library itself will build and the headers will work even if -echo ALBERTA, MPI, etc. cannot be found. An exception to this are UG and AmiraMesh -echo which need to be found right now if you want to use them later. -echo - # write output AC_CONFIG_FILES([Makefile doc/comm/Makefile doc/comm/Makefile.dist doc/comm/figures/Makefile - doc/layout/Makefile doc/doxygen/Makefile doc/doxygen/Doxyfile doc/Makefile @@ -46,3 +36,5 @@ AC_CONFIG_FILES([Makefile m4/Makefile dune-istl.pc]) AC_OUTPUT + +DUNE_SUMMARY_ALL diff --git a/doc/.wmlrc b/doc/.wmlrc deleted file mode 100644 index c4873027d..000000000 --- a/doc/.wmlrc +++ /dev/null @@ -1,3 +0,0 @@ --DROOT~.. --I. - diff --git a/doc/Makefile.am b/doc/Makefile.am index b9f1c760d..73489ef9e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -SUBDIRS = doxygen layout comm +SUBDIRS = doxygen comm TEXSOURCES = istl.tex istl.bib EPSFILES = blockstructure.eps diff --git a/doc/doxygen/doxy-footer.html b/doc/doxygen/doxy-footer.html deleted file mode 100644 index 0943e7d92..000000000 --- a/doc/doxygen/doxy-footer.html +++ /dev/null @@ -1,14 +0,0 @@ -</div> <!-- end doxygen --> -</div> <!-- end main --> -<div class="foot"> - -<p class="foot"> - Generated on $date with <a - href="http://www.doxygen.org/">Doxygen</a> (ver $doxygenversion) - [<a href="doxygen.log">logfile</a>]. -</p> - -</div> - -</body> -</html> \ No newline at end of file diff --git a/doc/doxygen/doxy-header.wml b/doc/doxygen/doxy-header.wml deleted file mode 100644 index 918e382e5..000000000 --- a/doc/doxygen/doxy-header.wml +++ /dev/null @@ -1,16 +0,0 @@ -# -*- html -*- -# $Id$ - -## praktische Tags -#use wml::std::tags - -#use wml::layout::header title="$title ($projectname $projectnumber)" -#use wml::layout::navigation - -<enter STYLESHEETS> - <link rel="stylesheet" type="text/css" href="./dune-doxy.css"> - <link rel="stylesheet" type="text/css" href="./tabs.css"> -<leave> - -<div class="main"> -<div class="doxygen"> diff --git a/doc/layout/.gitignore b/doc/layout/.gitignore deleted file mode 100644 index 55880268f..000000000 --- a/doc/layout/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -semantic.cache \ No newline at end of file diff --git a/doc/layout/Makefile.am b/doc/layout/Makefile.am deleted file mode 100644 index 544db6654..000000000 --- a/doc/layout/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -# $Id$ - -EXTRA_DIST = default.wml - -# nothing to install -web-install: - -include $(top_srcdir)/am/global-rules diff --git a/doc/layout/default.wml b/doc/layout/default.wml deleted file mode 100644 index fc2f2d9ff..000000000 --- a/doc/layout/default.wml +++ /dev/null @@ -1,21 +0,0 @@ -# -*- html -*- -# $Id$ - -# simple page layout, can be replaced by full version for the -# dune-website - -#use wml::std::tags - - -## Page layout - -#use wml::layout::header -#use wml::layout::navigation - -<body> - <dump BASIC_BODY> -</body> - -## catch any content after this: - -{#BASIC_BODY#: diff --git a/doc/layout/header.wml b/doc/layout/header.wml deleted file mode 100644 index eca1e08e8..000000000 --- a/doc/layout/header.wml +++ /dev/null @@ -1,11 +0,0 @@ -# -*- html -*- -# $Id$ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"\ - "http://www.w3.org/TR/html4/strict.dtd"> -<html> - -<head> -<title>$(title:-Untitled)</title> -{#STYLESHEETS#} -</head> diff --git a/doc/layout/navigation.wml b/doc/layout/navigation.wml deleted file mode 100644 index e69de29bb..000000000 -- GitLab