]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Intermediate
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 18:12:41 +0000 (18:12 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 18:12:41 +0000 (18:12 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27012 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/CMakeLists.txt
deal.II/doc/doxygen/CMakeLists.txt
deal.II/doc/doxygen/options.dox.in
deal.II/doc/scripts/filter [moved from deal.II/doc/doxygen/filter with 100% similarity]
deal.II/doc/scripts/validate-xrefs.pl [moved from deal.II/scripts/validate-xrefs.pl with 100% similarity]
deal.II/examples/Makefile [deleted file]

index c5c107f15b684e9995fde746e07b96704538a536..dc92cdf145fc45456394a1ce1628da35554b01aa 100644 (file)
@@ -31,7 +31,7 @@ IF(DEAL_II_COMPONENT_DOCUMENTATION)
   INSTALL(DIRECTORY .
     DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}
     COMPONENT documentation
-    FILES_MATCHING REGEX "^.*(html|css|eps|fig|png)$"  # TODO
+    FILES_MATCHING REGEX "^.*(html|css|eps|jpg|gif|fig|png|ico)$"  # TODO
     )
 
   CONFIGURE_FILE(
index 6512ff68da136f307db9855232e98a54dac9411c..27fbcd3480ca2d6f7e42d28cb7abd0bf7f4fa125 100644 (file)
@@ -1,9 +1,4 @@
 #
-# TODO:
-#
-# A very primitive proof of concept on how to use doxygen, atm.
-#
-#
 #  doxygen/tutorial/toc.html.in
 #  doxygen/header.tex.in
 #
@@ -24,14 +19,6 @@ CONFIGURE_FILE(
   COPYONLY
   )
 
-CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/filter
-  ${CMAKE_CURRENT_BINARY_DIR}/filter
-  COPYONLY
-  )
-
-
-
 file(GLOB doxygen_input
   ${CMAKE_SOURCE_DIR}/include/deal.II/*
   ${CMAKE_BINARY_DIR}/include/deal.II/*
@@ -70,13 +57,7 @@ ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all?
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/deal.II
-    ${CMAKE_CURRENT_BINARY_DIR}/options.dox
-    #already generated at configuration time:
-    #${CMAKE_CURRENT_BINARY_DIR}/header.html
-    #${CMAKE_CURRENT_BINARY_DIR}/footer.html
-    #${CMAKE_CURRENT_BINARY_DIR}/filter
-    #${CMAKE_BINARY_DIR}/include/deal.II/base/config.h
-    #${CMAKE_BINARY_DIR}/include/deal.II/lac/lapack_templates.h
+    ${CMAKE_CURRENT_BINARY_DIR}/options.dox # TODO
   COMMENT "Generating documentation via doxygen"
   VERBATIM
   )
index ec29fb9ceaa0130b26c63a7e401242c68df1f391..bcaeccef5264c60067f939227f2ca115e554d3bd 100644 (file)
@@ -507,7 +507,7 @@ IMAGE_PATH             =
 # to standard output.  If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
-INPUT_FILTER           = ./filter
+INPUT_FILTER           = ${CMAKE_SOURCE_DIR}/doc/scripts/filter
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.  Doxygen will compare the file name with each pattern and apply the
diff --git a/deal.II/examples/Makefile b/deal.II/examples/Makefile
deleted file mode 100644 (file)
index 14655af..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This Makefile only recurses into the subdirs
-include ../common/Make.global_options
-
-all: default
-
-# existing examples. take dirnames and strip 'step'
-steps = $(shell echo step-? step-??)
-
-
-# default is: build all examples. for each example, there is a target
-# build-step-N, where N in [1...]
-default: $(addprefix build-,$(steps)) doxygen
-
-# run example programs; make a target run-step-N for each N
-run: $(addprefix run-,$(steps)) run-doxygen
-
-# clean subdirs; make a target clean-step-N for each N
-clean:
-       -rm -f *~ */*~ */*.$(OBJEXT) */*gmv */*gnuplot */*gpl */*eps */*pov */*tex \
-       $(addsuffix $(EXEEXT),$(basename $(shell echo step-*/step-*.cc))) \
-       doxygen/*.o doxygen/*.exe */Makefile.dep
-
-# Create plain.cc in each subdirectory
-plain: $(steps)
-       for step in $(steps) ; do cd $$step; perl $D/doc/doxygen/tutorial/program2plain $$step.cc > plain.cc ; cd .. ; done
-
-# for each build/run/clean target: strip the build- prefix of the
-# target and build in that directory
-build-step-%:
-       cd $(@:build-%=%) ; $(MAKE)
-run-step-%:
-       cd $(@:run-%=%) ; $(MAKE) run
-clean-step-%:
-       cd $(@:clean-%=%) ; $(MAKE) clean
-doxygen:
-       cd doxygen ; $(MAKE)
-run-doxygen:
-       cd doxygen ; $(MAKE) run
-clean-doxygen:
-       cd doxygen ; $(MAKE) clean
-
-# all targets in this directory do not produce files, so they are
-# .PHONY:
-.PHONY: $(addprefix build-step-,$(steps)) \
-        $(addprefix run-step-,$(steps))   \
-        $(addprefix clean-step-,$(steps)) \
-       doxygen doxygen-run doxygen-clean
\ No newline at end of file

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.