From: bangerth Date: Mon, 24 Jul 2006 15:20:09 +0000 (+0000) Subject: Move the tutorial subdirectory into the doxygen/ directory, since that is where the... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e57ace5c9151ea14589bb0855d43132a206db1a1;p=dealii-svn.git Move the tutorial subdirectory into the doxygen/ directory, since that is where the data is consumed git-svn-id: https://svn.dealii.org/trunk@13426 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/Makefile.in b/deal.II/doc/Makefile.in index 2eb5499064..28b8f290d8 100644 --- a/deal.II/doc/Makefile.in +++ b/deal.II/doc/Makefile.in @@ -10,19 +10,16 @@ include $D/common/Make.global_options # default target. make sure validate-xrefs is only run after # everything else (can't appear in the list of dependencies since # would be run at the same time for parallel makes) -default: doxygen tutorial development +default: doxygen development @$(MAKE) validate-xrefs all: default # specific targets -doxygen: tutorial +doxygen: cd doxygen ; rm -f *.tag ; $(MAKE) -tutorial: - cd tutorial ; $(MAKE) - development: cd development ; $(MAKE) @@ -34,7 +31,6 @@ validate-xrefs: @echo "Validating cross-references in HTML files." $(PERL) $D/common/scripts/validate-xrefs.pl *html cd doxygen ; $(MAKE) validate-xrefs - cd tutorial ; $(MAKE) validate-xrefs cd development ; $(MAKE) validate-xrefs cd publications ; $(MAKE) validate-xrefs cd news ; $(MAKE) validate-xrefs @@ -42,10 +38,9 @@ validate-xrefs: clean: - cd tutorial ; $(MAKE) clean cd doxygen ; $(MAKE) clean cd development ; $(MAKE) clean cd glossary ; $(MAKE) clean -.PHONY: default doxygen all autogen-doc autogen-doc-all tutorial clean development validate-xrefs glossary +.PHONY: default doxygen all autogen-doc autogen-doc-all clean development validate-xrefs glossary diff --git a/deal.II/doc/doxygen/Makefile.in b/deal.II/doc/doxygen/Makefile.in index bd47cd3e95..21320bf4c2 100644 --- a/deal.II/doc/doxygen/Makefile.in +++ b/deal.II/doc/doxygen/Makefile.in @@ -20,17 +20,22 @@ private: # generate documentation. write the output to a file so as not to hide the # important message to impatient observers that this process can take quite # a while -deal.tag: deal.dox \ +deal.II deal.tag: tutorial \ + deal.dox \ $D/base/include/*/*.h \ $D/lac/include/*/*.h \ $D/deal.II/include/*/*.h \ headers/*.h \ - ../tutorial/chapter-2.step-by-step/doxygen/*.h + tutorial/doxygen/*.h @echo "=== Generating reference documentation. " \ "This can take several minutes..." @DOXYGEN@ deal.dox > doxygen.log -deal.II: deal.tag + +tutorial: + @cd tutorial ; $(MAKE) + + # validate cross references. there are so many html files in these # directories that we can just call @@ -49,6 +54,8 @@ validate-xrefs: clean: -for i in deal.II/* ; do rm $$i ; done -rm *.tag + @cd tutorial ; $(MAKE) clean + -.PHONY: html private deal.II \ +.PHONY: html tutorial private deal.II \ validate-xrefs clean diff --git a/deal.II/doc/doxygen/deal.dox b/deal.II/doc/doxygen/deal.dox index 3eb9ec97cc..a99c3aa33b 100644 --- a/deal.II/doc/doxygen/deal.dox +++ b/deal.II/doc/doxygen/deal.dox @@ -10,7 +10,7 @@ INPUT = headers/ \ ../../deal.II/include/grid \ ../../deal.II/include/multigrid \ ../../deal.II/include/numerics \ - ../tutorial/chapter-2.step-by-step/doxygen + tutorial/doxygen HTML_OUTPUT = deal.II LATEX_OUTPUT = LaTeX/deal.II diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile b/deal.II/doc/doxygen/tutorial/Makefile similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/Makefile rename to deal.II/doc/doxygen/tutorial/Makefile diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/foot.html b/deal.II/doc/doxygen/tutorial/foot.html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/foot.html rename to deal.II/doc/doxygen/tutorial/foot.html diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/head.html b/deal.II/doc/doxygen/tutorial/head.html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/head.html rename to deal.II/doc/doxygen/tutorial/head.html diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/index.html b/deal.II/doc/doxygen/tutorial/index.html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/index.html rename to deal.II/doc/doxygen/tutorial/index.html diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/navbar.html b/deal.II/doc/doxygen/tutorial/navbar.html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/navbar.html rename to deal.II/doc/doxygen/tutorial/navbar.html diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/program2doxygen b/deal.II/doc/doxygen/tutorial/program2doxygen similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/program2doxygen rename to deal.II/doc/doxygen/tutorial/program2doxygen diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/program2doxyplain b/deal.II/doc/doxygen/tutorial/program2doxyplain similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/program2doxyplain rename to deal.II/doc/doxygen/tutorial/program2doxyplain diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/program2html b/deal.II/doc/doxygen/tutorial/program2html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/program2html rename to deal.II/doc/doxygen/tutorial/program2html diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/program2plain b/deal.II/doc/doxygen/tutorial/program2plain similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/program2plain rename to deal.II/doc/doxygen/tutorial/program2plain diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/program2toc b/deal.II/doc/doxygen/tutorial/program2toc similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/program2toc rename to deal.II/doc/doxygen/tutorial/program2toc diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/title.html b/deal.II/doc/doxygen/tutorial/title.html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/title.html rename to deal.II/doc/doxygen/tutorial/title.html diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/toc.html b/deal.II/doc/doxygen/tutorial/toc.html similarity index 100% rename from deal.II/doc/tutorial/chapter-2.step-by-step/toc.html rename to deal.II/doc/doxygen/tutorial/toc.html