Changeset 1225

Timestamp:

Mar 12, 2008, 10:36:45 PM (15 years ago)

Author:

Peter

Message:

Replaced deprecated macro AM_CONFIG_HEADER.
Let configure create doxygen.config (rather than make).
avoid having multiple doxygen config files.
Setting INLINE_INHERITED_MEMB = YES.
Changing TAB_SIZE = 2.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• doc/Makefile.am (modified) (1 diff)
• doc/doxygen.config.in (modified) (6 diffs)

trunk/configure.ac

@@ -44 +44 @@
 AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
 
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE()
 
@@ -167 +167 @@
 AC_CONFIG_FILES([Makefile
      doc/Makefile
+     doc/doxygen.config
      test/Makefile
      test/data/Makefile

trunk/doc/Makefile.am

@@ -37 +37 @@
 pdf-local: latex-local
 
-html-local: doxygen_html.config FORCE 
-  @doxygen doxygen_html.config;
+html-local: doxygen.config FORCE 
+  (cat doxygen.config; $(ECHO) GENERATE_LATEX = NO) | doxygen -;
 
 # this is not supported by automake - there is no target latex
-latex-local: doxygen_latex.config FORCE 
-  @doxygen doxygen_latex.config
+latex-local: doxygen.config FORCE 
+  @(cat doxygen.config; $(ECHO) GENERATE_HTML = NO) | doxygen -;
 
-
-doxygen.config: doxygen.config.in Makefile
-  @$(ECHO) '# doxygen.config generated from doxygen.config.in.' > $@;
-  @$(SED) -e 's/PROJECT_NUMBER.*= /&$(VERSION)/g' doxygen.config.in >> $@
-
-doxygen_html.config: doxygen.config Makefile
-  @$(ECHO) '# doxygen_html.config generated from doxygen.config.in.' > $@;
-  @$(SED) -e 's/GENERATE_LATEX.*= /&no/g' doxygen.config >> $@
-
-doxygen_latex.config: doxygen.config Makefile
-  @$(ECHO) '# doxygen_latex.config generated from doxygen.config.in.' > $@;
-  @$(SED) -e 's/GENERATE_HTML.*= /&no/g' doxygen.config >> $@
 
 endif

trunk/doc/doxygen.config.in

@@ +1 @@
+# @configure_input@
 # $Id$
 
@@ -42 +43 @@
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "yat"
+PROJECT_NAME           = "@PACKAGE@"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
@@ -48 +49 @@
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
@@ -130 +131 @@
 # the base classes will not be shown.
 
-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB  = YES
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
@@ -245 +246 @@
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 4
+TAB_SIZE               = 2
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
@@ -309 +310 @@
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are