diff --git a/configure.ac b/configure.ac index 73df2eb9ced210a92430ad0538750bf3e0678ef3..c91db96448b0fcd6764fc89a8557e820eac3e456 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 9aff93449f4d5b02e629bf4d3569c19b504a042b..574dddc616db9bc174eca360b5aa5146795ffc82 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 02e29a644f97efa7a432fb2b73df044e6cca7a37..05ee2efc23e9f3a398f37988618edd1548475cfc 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