cleanup doc/* Makefiles, use the new infrastructure from dune-common

[[Imported from SVN: r1149]]

configure.ac

@@ -19,12 +19,10 @@ AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS) $(DUNE_LIBS)')
 # write output
 AC_CONFIG_FILES([Makefile
     doc/comm/Makefile
-    doc/comm/Makefile.dist
     doc/comm/figures/Makefile
     doc/doxygen/Makefile
     doc/doxygen/Doxyfile
     doc/Makefile
-    doc/Makefile.dist
     dune/istl/paamg/test/Makefile
     dune/istl/paamg/Makefile
     dune/istl/tutorial/Makefile

doc/Makefile.am

@@ -4,35 +4,17 @@ SUBDIRS = doxygen comm
 
 TEXSOURCES = istl.tex istl.bib
 EPSFILES = blockstructure.eps
-EXTRA_DIST = istl.pdf Makefile.dist.in Makefile.dist.am
 if BUILD_DOCS
-  DOCS = istl.pdf
+  DOCFILES = istl.pdf
+  EXTRA_DIST = istl.pdf
 endif
 
 # setting like in dune-web
 BASEDIR=../..
 CURDIR=doc/istl
-docdir=$(datadir)/doc/dune-istl
-
-doc_DATA = $(DOCS)
-
-CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps
-
-# files to clean only in svn tree but not in tarball
-SVNCLEANFILES =  *.pdf
-clean-local:
-	if test -e $(top_srcdir)/doc/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES); fi
 
-if BUILD_DOCS
-dist-hook:
-	sed $(srcdir)/Makefile.dist.am -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.am
-	sed $(srcdir)/Makefile.dist.in -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.in
-else
-dist-hook:
-	echo "# No documentation included in distribution! " > $(distdir)/$(DOCUMENTATION_TAG_FILE)
-	sed $(srcdir)/Makefile.dist.am -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.am
-	sed $(srcdir)/Makefile.dist.in -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.in
-endif
+# where to install the docs
+docdir=$(datadir)/doc/dune-istl
 
 include $(top_srcdir)/am/latex
 include $(top_srcdir)/am/webstuff

doc/Makefile.dist.am

-# $Id: Makefile.am 724 2007-03-01 11:30:49Z christi $
-
-SUBDIRS = doxygen comm
-
-docdir=$(datadir)/doc/dune-istl
-
-doc_DATA = istl.pdf
-
-CONFIG_CLEAN_FILES = *.dist
-
-include $(top_srcdir)/am/latex
-include $(top_srcdir)/am/webstuff
-include $(top_srcdir)/am/global-rules

doc/comm/Makefile.am

@@ -6,48 +6,27 @@ SUBDIRS = figures
 if MPI
   MPIPROGRAMS = indexset
 endif
-
-SUFFIXES = .dvi .tex .pdf
+# programs just to build when "make check" is used
+check_PROGRAMS = $(MPIPROGRAMS)
+# list of tests to run (indicestest is special case)
+TESTS = $(MPIPROGRAMS)
 
 if BUILD_DOCS
-  DOCS = communication.pdf communication.ps
+  DOCFILES = communication.pdf
+  EXTRA_DIST = communication.pdf
 endif
 
-
 # setting like in dune-web
-RELDIR=istl/comm
-CURDIR=doc/$(RELDIR)
+CURDIR=doc/istl/comm
 BASEDIR=../../..
-commdir=$(datadir)/doc/dune-istl/comm
 
-# list of tests to run (indicestest is special case)
-TESTS = $(MPIPROGRAMS)
+# install the docs
+docdir=$(datadir)/doc/dune-istl/comm
 
-# programs just to build when "make check" is used
-check_PROGRAMS = $(MPIPROGRAMS)
+include $(top_srcdir)/am/latex
+include $(top_srcdir)/am/webstuff
+include $(top_srcdir)/am/global-rules
 
 indexset_SOURCES = indexset.cc buildindexset.hh reverse.hh
 indexset_CXXFLAGS = $(MPI_CPPFLAGS)
 indexset_LDADD = $(MPI_LDFLAGS)
-
-comm_DATA = $(DOCS) #$(indexset_SOURCES)
-
-EXTRA_DIST = communication.pdf Makefile.dist.in Makefile.dist.am
-
-communication.dvi : communication.tex buildindexset.hh reverse.hh
-
-
-CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
-
-# files to clean only in svn tree but not in tarball
-SVNCLEANFILES =  *.pdf *.ps
-clean-local:
-	if test -e $(top_srcdir)/doc/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES); fi
-
-dist-hook:
-	sed $(srcdir)/Makefile.dist.am -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.am
-	sed $(srcdir)/Makefile.dist.in -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.in
-
-include $(top_srcdir)/am/latex
-include $(top_srcdir)/am/webstuff
-include $(top_srcdir)/am/global-rules

doc/comm/Makefile.dist.am

-# $Id: Makefile.am 665 2006-10-30 13:15:50Z christi $
-
-SUBDIRS = figures
-
-# only build these programs if an MPI-implementation was found
-if MPI
-  MPIPROGRAMS = indexset
-endif
-
-commdir=$(datadir)/doc/dune-istl/comm
-
-comm_DATA = communication.pdf
-
-CONFIG_CLEAN_FILES = *.dist
-
-include $(top_srcdir)/am/latex
-include $(top_srcdir)/am/webstuff
-include $(top_srcdir)/am/global-rules

doc/doxygen/Makefile.am

@@ -3,25 +3,6 @@
 # setting like in dune-web
 BASEDIR=../..
 CURDIR=doc/doxygen
-WHAT=
-
-doxygendir = $(datadir)/doc/dune-istl/doxygen
-doxygen_DATA = $(WHAT)
-
-#we need this in the distribution
-EXTRA_DIST = $(WHAT) $(DOXYGENDISTFILES)
-
-all: $(WHAT) $(DOXYGENFILES)
 
 include $(top_srcdir)/am/doxygen
 include $(top_srcdir)/am/global-rules
-
-# file to clean only in svn and not in tarball tree
-SVNCLEANFILES = html $(WHAT) $(DOXYGENHEADER)
-
-clean-local:
-	if test "x$(VPATH)" != "x" && test ! -e $(srcdir)/doxygen-tag; then \
-	  if test -e $(top_srcdir)/doc/doxygen/Doxydep; then \
-	    rm -rf $(SVNCLEANFILES); \
-	  fi; \
-	fi