[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3680 - in trunk/OpenDNSSEC: . enforcer libhsm signer

Jakob Schlyter jakob at kirei.se
Mon Aug 9 13:44:42 CEST 2010


Author: jakob
Date: 2010-08-09 13:44:42 +0200 (Mon, 09 Aug 2010)
New Revision: 3680

Removed:
   trunk/OpenDNSSEC/doxygen.am
Modified:
   trunk/OpenDNSSEC/Doxyfile.in
   trunk/OpenDNSSEC/Makefile.am
   trunk/OpenDNSSEC/enforcer/Makefile.am
   trunk/OpenDNSSEC/libhsm/Makefile.am
   trunk/OpenDNSSEC/signer/Makefile.am
Log:
rework doxygen, split into one doc set per module


Modified: trunk/OpenDNSSEC/Doxyfile.in
===================================================================
--- trunk/OpenDNSSEC/Doxyfile.in	2010-08-09 11:32:32 UTC (rev 3679)
+++ trunk/OpenDNSSEC/Doxyfile.in	2010-08-09 11:44:42 UTC (rev 3680)
@@ -25,7 +25,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = @PACKAGE_NAME@
+PROJECT_NAME           = $(PROJECT_NAME)
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -38,7 +38,7 @@
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @abs_builddir@/doxygen-doc
+OUTPUT_DIRECTORY       = $(OUTPUTDIR)
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -757,7 +757,7 @@
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
 # generate HTML output.
 
-GENERATE_HTML          = YES
+GENERATE_HTML          = $(GENERATE_HTML)
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -837,7 +837,7 @@
 # Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
 # of the generated HTML documentation.
 
-GENERATE_HTMLHELP      = NO
+GENERATE_HTMLHELP      = $(GENERATE_HTMLHELP)
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
@@ -857,7 +857,7 @@
 # controls if a separate .chi index file is generated (YES) or that 
 # it should be included in the master .chm file (NO).
 
-GENERATE_CHI           = NO
+GENERATE_CHI           = $(GENERATE_CHI)
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
 # is used to encode HtmlHelp index (hhk), content (hhc) and project file 
@@ -974,7 +974,7 @@
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
 # generate Latex output.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = $(GENERATE_LATEX)
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1051,7 +1051,7 @@
 # The RTF output is optimized for Word 97 and may not look very pretty with 
 # other RTF readers or editors.
 
-GENERATE_RTF           = NO
+GENERATE_RTF           = $(GENERATE_RTF)
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1121,7 +1121,7 @@
 # generate an XML file that captures the structure of 
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = $(GENERATE_XML)
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1339,7 +1339,7 @@
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = NO
+HAVE_DOT               = $(HAVE_DOT)
 
 # By default doxygen will write a font called FreeSans.ttf to the output 
 # directory and reference it in all dot files that doxygen generates. This 
@@ -1414,7 +1414,7 @@
 # the time of a run. So in most cases it will be better to enable call graphs 
 # for selected functions only using the \callgraph command.
 
-CALL_GRAPH             = YES
+CALL_GRAPH             = NO
 
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
 # doxygen will generate a caller dependency graph for every global function 
@@ -1422,19 +1422,19 @@
 # the time of a run. So in most cases it will be better to enable caller 
 # graphs for selected functions only using the \callergraph command.
 
-CALLER_GRAPH           = YES
+CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
-GRAPHICAL_HIERARCHY    = YES
+GRAPHICAL_HIERARCHY    = NO
 
 # If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
 # then doxygen will show the dependencies a directory has on other directories 
 # in a graphical way. The dependency relations are determined by the #include 
 # relations between the files in the directories.
 
-DIRECTORY_GRAPH        = YES
+DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are png, jpg, or gif 
@@ -1445,7 +1445,7 @@
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = 
+DOT_PATH               = $(DOT_PATH)
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that 
 # contain dot files that are included in the documentation (see the 

Modified: trunk/OpenDNSSEC/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/Makefile.am	2010-08-09 11:32:32 UTC (rev 3679)
+++ trunk/OpenDNSSEC/Makefile.am	2010-08-09 11:44:42 UTC (rev 3680)
@@ -37,5 +37,3 @@
 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
-
-include doxygen.am

Modified: trunk/OpenDNSSEC/enforcer/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/Makefile.am	2010-08-09 11:32:32 UTC (rev 3679)
+++ trunk/OpenDNSSEC/enforcer/Makefile.am	2010-08-09 11:44:42 UTC (rev 3680)
@@ -3,3 +3,10 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 SUBDIRS = ksm common enforcerd utils test
+
+doxygen:
+	env $(DX_ENV) \
+		PROJECT_NAME="OpenDNSSEC-enforcer" \
+		SRCDIR=$(top_srcdir)/enforcer \
+		OUTPUTDIR=$(top_builddir)/enforcer/doxygen-doc \
+		$(DX_DOXYGEN) $(top_builddir)/$(DX_CONFIG)

Modified: trunk/OpenDNSSEC/libhsm/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/libhsm/Makefile.am	2010-08-09 11:32:32 UTC (rev 3679)
+++ trunk/OpenDNSSEC/libhsm/Makefile.am	2010-08-09 11:44:42 UTC (rev 3680)
@@ -3,3 +3,10 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 SUBDIRS = src checks
+
+doxygen:
+	env $(DX_ENV) \
+		PROJECT_NAME="OpenDNSSEC-libhsm" \
+		SRCDIR=$(top_srcdir)/libhsm \
+		OUTPUTDIR=$(top_builddir)/libhsm/doxygen-doc \
+		$(DX_DOXYGEN) $(top_builddir)/$(DX_CONFIG)

Modified: trunk/OpenDNSSEC/signer/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/signer/Makefile.am	2010-08-09 11:32:32 UTC (rev 3679)
+++ trunk/OpenDNSSEC/signer/Makefile.am	2010-08-09 11:44:42 UTC (rev 3680)
@@ -3,3 +3,10 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 SUBDIRS = src
+
+doxygen:
+	env $(DX_ENV) \
+		PROJECT_NAME="OpenDNSSEC-signer" \
+		SRCDIR=$(top_srcdir)/signer \
+		OUTPUTDIR=$(top_builddir)/signer/doxygen-doc \
+		$(DX_DOXYGEN) $(top_builddir)/$(DX_CONFIG)




More information about the Opendnssec-commits mailing list