0.6.14.cvs2. Call graphs for internal docs, only build them when --enable-internal...

diff --git a/NEWS b/NEWS
index a40e921..fc7277c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 0.6.14.cvs1 since 0.6.14 (2007-05-10):
+New in 0.6.14.cvs2 since 0.6.14 (2007-05-10):
 
   * Added support of 2 new types of Pentax makernotes & Casio type2 makernote
 
@@ -8,7 +8,10 @@ New in 0.6.14.cvs1 since 0.6.14 (2007-05-10):
   * Bug fixes:
     [ 1443183 ] install error when doxygen is not present.
 
-  * Improved doxygen generated documentation.
+  * Improved doxygen generated API and code internals
+    documentation. Made building of code internals docs optional
+    (--enable-internal-docs) as the call graphs take quite long to
+    build.
 
 
 New in 0.6.14 (2007-05-10) since 0.6.13 (2005-12-27):

diff --git a/configure.ac b/configure.ac
index eeab739..d577240 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([EXIF library], [0.6.14.cvs1], [libexif-devel@lists.sourceforge.net], [libexif])
+AC_INIT([EXIF library], [0.6.14.cvs2], [libexif-devel@lists.sourceforge.net], [libexif])
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
@@ -122,13 +122,38 @@ AC_SUBST([MATHLIBS])
 GP_CHECK_DOC_DIR
 GP_CHECK_DOXYGEN
 
+# Whether to enable the internal docs build.
+#
+# This takes quite some time due to the generation of lots of call
+# graphs, so it is disabled by default.
+enable_internal_docs=no
+AC_ARG_ENABLE([internal-docs], [dnl
+AS_HELP_STRING([--enable-internal-docs], 
+[Build internal code docs if doxygen available])], [dnl
+  if   test "x$enableval" = xno \
+    || test "x$enableval" = xoff \
+    || test "x$enableval" = xfalse; 
+  then
+    enable_internal_docs=no
+  elif test "x$enableval" = xyes \
+    || test "x$enableval" = xon \
+    || test "x$enableval" = xtrue
+  then
+    enable_internal_docs=yes
+  fi
+])
+AC_MSG_CHECKING([whether to create internal code docs])
+AC_MSG_RESULT([${enable_internal_docs}])
+AM_CONDITIONAL([ENABLE_INTERNAL_DOCS],
+               [test "x${enable_internal_docs}" = "xyes"])
+
 
 # ---------------------------------------------------------------------------
 # i18n support
 # ---------------------------------------------------------------------------
+ALL_LINGUAS="de es fr pl ru vi"
 GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
                 [Lutz Mueller and others])
-ALL_LINGUAS="de es fr pl ru vi"
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS()

diff --git a/doc/Doxyfile-internals.in b/doc/Doxyfile-internals.in
index 7fabc83..55661aa 100644 (file)
--- a/doc/Doxyfile-internals.in
+++ b/doc/Doxyfile-internals.in
@@ -1122,7 +1122,7 @@ INCLUDED_BY_GRAPH      = YES
 # So in most cases it will be better to enable call graphs for selected 
 # functions only using the \callgraph command.
 
-CALL_GRAPH             = NO
+CALL_GRAPH             = YES
 
 # 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.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 716db99..c36ebe5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,11 +2,21 @@
 # Conditional rules, depending on tool availability
 ########################################################################
 
+DOXYGEN_FILES =
+DOXYGEN_STAMPS =
+DOXYGEN_UPLOAD =
+
 if HAVE_DOXYGEN
 
-DOXYGEN_FILES =
-DOXYGEN_STAMPS = $(HTML_APIDOC_DIR).stamp    $(HTML_APIDOC_INTERNALS_DIR).stamp $(DOXYGEN_OUTPUT_DIR).stamp
-DOXYGEN_UPLOAD = $(HTML_APIDOC_DIR).uploaded $(HTML_APIDOC_INTERNALS_DIR).uploaded
+DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp
+DOXYGEN_UPLOAD += $(HTML_APIDOC_DIR).uploaded
+
+if ENABLE_INTERNAL_DOCS
+DOXYGEN_STAMPS += $(HTML_APIDOC_INTERNALS_DIR).stamp
+DOXYGEN_UPLOAD += $(HTML_APIDOC_INTERNALS_DIR).uploaded
+endif
+
+DOXYGEN_STAMPS += $(DOXYGEN_OUTPUT_DIR).stamp
 
 # FIXME: Depending on the source files would be sufficient...
 $(HTML_APIDOC_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
@@ -43,11 +53,11 @@ install-apidocs: $(HTML_APIDOC_DIR).stamp
        $(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)/
 
 uninstall-apidocs-internals:
-       rm -f $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)/*
+       cd $(DESTDIR)$(docdir) && rm -f $(DOC_APIDOC_INTERNALS_HTML)/*
        rmdir $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)
 
 uninstall-apidocs:
-       rm -f $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)/*
+       cd $(DESTDIR)$(docdir) && rm -f $(DOC_APIDOC_HTML)/*
        rmdir $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)
 
 clean-apidocs: