[Openvas-commits] r3337 - in trunk/openvas-manager: . doc src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-05-12 16:30:53 +0200 (Tue, 12 May 2009)
New Revision: 3337

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/doc/CMakeLists.txt
   trunk/openvas-manager/doc/Doxyfile
   trunk/openvas-manager/doc/Doxyfile_full
   trunk/openvas-manager/src/openvasmd.c
Log:
	* doc/Doxyfile, doc/Doxyfile_full (INPUT): Revert to explicit file list.

	* doc/CMakeLists.txt (DOC_FILES): New variable.
	(.built-html, .built-html_full): Add back dependencies.

	* src/openvasmd.c (manpage): Adjust include for updated Doxyfile
	EXAMPLE_PATH.


Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-05-12 14:21:09 UTC (rev 3336)
+++ trunk/openvas-manager/ChangeLog	2009-05-12 14:30:53 UTC (rev 3337)
@@ -1,5 +1,15 @@
 2009-05-12  Matthew Mundell <mmundell at intevation.de>
 
+	* doc/Doxyfile, doc/Doxyfile_full (INPUT): Revert to explicit file list.
+
+	* doc/CMakeLists.txt (DOC_FILES): New variable.
+	(.built-html, .built-html_full): Add back dependencies.
+
+	* src/openvasmd.c (manpage): Adjust include for updated Doxyfile
+	EXAMPLE_PATH.
+
+2009-05-12  Matthew Mundell <mmundell at intevation.de>
+
 	* doc/Doxyfile_full: Flush trailing whitespace.
 
 2009-05-12  Michael Wiegand <michael.wiegand at intevation.de>

Modified: trunk/openvas-manager/doc/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/doc/CMakeLists.txt	2009-05-12 14:21:09 UTC (rev 3336)
+++ trunk/openvas-manager/doc/CMakeLists.txt	2009-05-12 14:30:53 UTC (rev 3337)
@@ -76,6 +76,15 @@
   message (FATAL_ERROR "Doxygen is required to build the HTML docs.")
 endif (NOT DOXYGEN_EXECUTABLE)
 
+set (DOC_FILES
+     ../src/openvasmd.c ../src/ovas-mngr-comm.c
+	 ../src/ompd.c ../src/otpd.c
+	 ../src/manage.c ../src/omp.c ../src/otp.c
+	 ../src/string.c ../src/file.c
+	 ../src/tasks_sql.h ../src/tasks_fs.h ../src/tracef.h
+	 ../src/logf.h ../src/tests/common.c
+	 ../README ../INSTALL)
+
 add_custom_target (doc COMMENT "Building documentation..."
                    DEPENDS openvasmd.8 Doxyfile .built-html)
 
@@ -108,11 +117,13 @@
 
 add_custom_command (OUTPUT .built-html
                     COMMAND sh
-					ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile && touch doc/.built-html\;\")
+					ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile && touch doc/.built-html\;\"
+					DEPENDS openvasmd.html Doxyfile ${DOC_FILES})
 
 add_custom_command (OUTPUT .built-html_full
                     COMMAND sh
-					ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile_full && touch doc/.built-html_full\;\")
+					ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile_full && touch doc/.built-html_full\;\"
+					DEPENDS openvasmd.html Doxyfile_full ${DOC_FILES})
 
 # if (GROFF_DOES_HTML)
 #   add_custom_command (OUTPUT openvasmd.html

Modified: trunk/openvas-manager/doc/Doxyfile
===================================================================
--- trunk/openvas-manager/doc/Doxyfile	2009-05-12 14:21:09 UTC (rev 3336)
+++ trunk/openvas-manager/doc/Doxyfile	2009-05-12 14:30:53 UTC (rev 3337)
@@ -459,7 +459,20 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = src
+INPUT                  = src/string.c \
+                         src/file.c \
+                         src/tests/common.c \
+                         src/logf.h \
+                         src/tracef.h \
+                         src/manage.c \
+                         src/tasks_sql.h \
+                         src/tasks_fs.h \
+                         src/ovas-mngr-comm.c \
+                         src/otp.c \
+                         src/omp.c \
+                         src/ompd.c \
+                         src/otpd.c \
+                         src/openvasmd.c
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp

Modified: trunk/openvas-manager/doc/Doxyfile_full
===================================================================
--- trunk/openvas-manager/doc/Doxyfile_full	2009-05-12 14:21:09 UTC (rev 3336)
+++ trunk/openvas-manager/doc/Doxyfile_full	2009-05-12 14:30:53 UTC (rev 3337)
@@ -459,7 +459,20 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = src
+INPUT                  = src/string.c \
+                         src/file.c \
+                         src/tests/common.c \
+                         src/logf.h \
+                         src/tracef.h \
+                         src/manage.c \
+                         src/tasks_sql.h \
+                         src/tasks_fs.h \
+                         src/ovas-mngr-comm.c \
+                         src/otp.c \
+                         src/omp.c \
+                         src/ompd.c \
+                         src/otpd.c \
+                         src/openvasmd.c
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp

Modified: trunk/openvas-manager/src/openvasmd.c
===================================================================
--- trunk/openvas-manager/src/openvasmd.c	2009-05-12 14:21:09 UTC (rev 3336)
+++ trunk/openvas-manager/src/openvasmd.c	2009-05-12 14:30:53 UTC (rev 3337)
@@ -76,7 +76,7 @@
 
 /**
  * \page manpage openvasmd
- * \htmlinclude openvasmd.html
+ * \htmlinclude doc/openvasmd.html
  */
 
 #ifndef S_SPLINT_S