From f4b3d21bcadd3bdcecbbaa5fef1cb37b4d3db852 Mon Sep 17 00:00:00 2001
From: Jorrit Fahlke <joe@dune-project.org>
Date: Fri, 10 Feb 2006 16:24:33 +0000
Subject: [PATCH] * rip the common latex rules out of doc/istl/comm/Makefile.am
and put them into am/latex. * import the "Praktukumsbericht" about
Refinement into cvs.
[[Imported from SVN: r509]]
---
configure.ac | 1 +
doc/istl/Makefile.am | 22 +---------------------
doc/istl/comm/Makefile.am | 22 +---------------------
3 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/configure.ac b/configure.ac
index 73df2eb9c..c91db9644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ AC_CHECK_PROGS([WML], [wml], [true])
AM_CONDITIONAL([WML], [test "x$WML" != xtrue])
AC_CHECK_PROGS([PERL], [perl], [true])
DUNE_INKSCAPE
+AC_CHECK_PROGS([CONVERT], [convert], [true])
# doxygen and latex take a lot of time...
AC_ARG_ENABLE(documentation,
diff --git a/doc/istl/Makefile.am b/doc/istl/Makefile.am
index 9aff93449..574dddc61 100644
--- a/doc/istl/Makefile.am
+++ b/doc/istl/Makefile.am
@@ -8,31 +8,11 @@ endif
dist_pkgdata_DATA = $(DOCS)
-# rerun TEX if log-file suggests that
-.tex.dvi:
- $(TEX) $*
- while grep Rerun $*.log > /dev/null ; do \
- $(TEX) $* ; \
- done
-# check if Bibtex needs to be called
- if grep '^\\citation{' *.aux > /dev/null ; then \
- $(BIBTEX) $* ; \
- $(TEX) $* ; \
- while grep Rerun $*.log > /dev/null ; do \
- $(TEX) $* ; \
- done ; \
- fi
-
-.dvi.pdf:
- $(DVIPDF) $*
-
-.dvi.ps:
- $(DVIPS) $*
-
CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
# setting like in dune-web
CURDIR=doc/istl
+include $(top_srcdir)/am/latex
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules
diff --git a/doc/istl/comm/Makefile.am b/doc/istl/comm/Makefile.am
index 02e29a644..05ee2efc2 100644
--- a/doc/istl/comm/Makefile.am
+++ b/doc/istl/comm/Makefile.am
@@ -19,27 +19,6 @@ indexset_SOURCES = indexset.cc buildindexset.hh reverse.hh
indexset_CXXFLAGS = $(MPI_CPPFLAGS)
indexset_LDADD = $(MPI_LDFLAGS)
-# rerun TEX if log-file suggests that
-.tex.dvi:
- $(TEX) $*
- while grep Rerun $*.log > /dev/null ; do \
- $(TEX) $* ; \
- done
-# check if Bibtex needs to be called
- if grep '^\\citation{' *.aux > /dev/null ; then \
- $(BIBTEX) $* ; \
- $(TEX) $* ; \
- while grep Rerun $*.log > /dev/null ; do \
- $(TEX) $* ; \
- done ; \
- fi
-
-.dvi.pdf:
- $(DVIPDF) $*
-
-.dvi.ps:
- $(DVIPS) $*
-
communication.dvi : communication.tex buildindexset.hh reverse.hh
@@ -49,5 +28,6 @@ CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
# setting like in dune-web
CURDIR=doc/istl/comm
+include $(top_srcdir)/am/latex
include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/global-rules
--
GitLab