GNOME.org
 

[librsvgmm] Stop distributing generated documentation

commit 443b084db43bf465d9f6ae8fb665d0669206464b
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Jul 11 20:15:59 2009 +0200

    Stop distributing generated documentation
    
    * configure.ac (GLIBMM_CHECK_PERL): Remove.
    * build/mm-doc.m4 (_MM_ARG_ENABLE_DOCUMENTATION): Check for Perl and
    dot at this point, too, and require their presence if building the
    documentation has not been explicitly disabled.  Remove now obsolete
    USE_MAINTAINER_MODE logic.
    
    * build/generate-binding.am: Replace $(PERL_PATH) by $(PERL).
    * build/doc-reference.am: Likewise.
    (reference_DATA): Remove dist prefix.
    (htmlref_DATA): Likewise.
    (CLEANFILES): Remove generated files during normal clean.
    (reference_deps): List dependencies directly in the prerequisites
    of the documentation target, as the MAINTAINER_MODE conditional is
    no longer necessary.
    (clean-local): Rename from maintainer-clean-local.

 build/doc-reference.am    |   25 +++++++++----------------
 build/generate-binding.am |    2 +-
 build/mm-doc.m4           |   29 ++++++++++++++++++-----------
 configure.ac              |    3 ---
 4 files changed, 28 insertions(+), 31 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index ab03e8c..4790dfa 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -30,17 +30,16 @@ htmlref_files := $(or $(wildcard\
 	$(htmlref_patterns)),$(wildcard\
 	$(addprefix $(srcdir)/,$(htmlref_patterns))))
 
-referencedir = $(datarootdir)/doc/$(book_name)/reference
-dist_reference_DATA = $(doxytagfile)
+referencedir   = $(datarootdir)/doc/$(book_name)/reference
+reference_DATA = $(doxytagfile)
 
-htmlrefdir = $(referencedir)/html
-dist_htmlref_DATA = $(htmlref_files)
+htmlrefdir   = $(referencedir)/html
+htmlref_DATA = $(htmlref_files)
 
-devhelpdir = $(datadir)/devhelp/books/$(book_name)
+devhelpdir   = $(datadir)/devhelp/books/$(book_name)
 devhelp_DATA = $(devhelpfile)
 
-DISTCLEANFILES = $(devhelpfile) reference/doxygen.log
-MAINTAINERCLEANFILES = $(doxytagfile)
+CLEANFILES = $(doxytagfile) $(devhelpfile) reference/doxygen.log
 
 beautify_docs ?= $(GMMPROC_DIR)/beautify_docs.pl
 doxytag_to_devhelp2 ?= $(GMMPROC_DIR)/doxytag_to_devhelp2.xsl
@@ -49,25 +48,19 @@ dh_xsl_params =	--stringparam book_title '$(book_title)' \
 		--stringparam book_name '$(book_name)' \
 		--stringparam reference_prefix "$(htmlrefdir)"
 
-if MAINTAINER_MODE
-reference_deps = reference/Doxyfile $(doc_input)
-else
-reference_deps =
-endif
-
 .DELETE_ON_ERROR:
 
-maintainer-clean-local:
+clean-local:
 	-rm -rf reference/html
 
 reference/Doxyfile: $(srcdir)/reference/Doxyfile.in $(top_builddir)/config.status
 	cd "$(top_builddir)" && $(SHELL) ./config.status '$(subdir)/$@'
 
-$(doxytagfile): $(reference_deps)
+$(doxytagfile): reference/Doxyfile $(doc_input)
 	-rm -f '$@'
 	-rm -rf reference/html
 	(echo '@INCLUDE =' reference/Doxyfile && echo 'INPUT =' $(doc_input)) | $(DOXYGEN) -
-	$(PERL_PATH) "$(beautify_docs)" reference/html
+	$(PERL) "$(beautify_docs)" reference/html
 
 reference/html/%: $(doxytagfile)
 
diff --git a/build/generate-binding.am b/build/generate-binding.am
index 9ba7751..6533080 100644
--- a/build/generate-binding.am
+++ b/build/generate-binding.am
@@ -32,7 +32,7 @@ path_files_hg	= $(files_hg:%.hg=$(srcdir)/%.hg)
 stamp_files	= $(files_hg:%.hg=$(stamp_dir)/stamp-%)
 
 gmmproc		= $(GMMPROC_DIR)/gmmproc -I $(codegen_dir)/m4 --defs $(srcdir)
-gen_wrap_init	= $(PERL_PATH) $(GMMPROC_DIR)/generate_wrap_init.pl $(wrap_init_flags)
+gen_wrap_init	= $(PERL) $(GMMPROC_DIR)/generate_wrap_init.pl $(wrap_init_flags)
 
 .DELETE_ON_ERROR:
 .PHONY: mkdir-stamps
diff --git a/build/mm-doc.m4 b/build/mm-doc.m4
index b63d75e..b97ccb2 100644
--- a/build/mm-doc.m4
+++ b/build/mm-doc.m4
@@ -15,13 +15,19 @@
 ## You should have received a copy of the GNU General Public License
 ## along with mm-autofu.  If not, see <http://www.gnu.org/licenses/>.
 
-#serial 20090705
+#serial 20090711
 
 ## _MM_ARG_ENABLE_DOCUMENTATION(variable)
 ##
 m4_define([_MM_ARG_ENABLE_DOCUMENTATION],
 [dnl
-AC_ARG_VAR([DOXYGEN], [path to doxygen utility])
+AC_ARG_VAR([PERL], [path to Perl interpreter])
+AC_CHECK_PROG([PERL], [perl], [perl])[]dnl
+
+AC_ARG_VAR([DOT], [path to dot utility])
+AC_CHECK_PROG([DOT], [dot], [dot])[]dnl
+
+AC_ARG_VAR([DOXYGEN], [path to Doxygen utility])
 AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])[]dnl
 
 AC_ARG_VAR([XSLTPROC], [path to xsltproc utility])
@@ -33,16 +39,18 @@ AC_ARG_ENABLE([documentation],
               [$1=$enableval],
               [$1=yes])[]dnl
 
-AS_IF([test "x$$1" != xno],
-[
-  AS_IF([test "x$USE_MAINTAINER_MODE" != xno && test "x$DOXYGEN" = x], [mm_missing=doxygen],
+AS_IF([test "x[$]$1" != xno],
+[dnl
+  AS_IF([test "x$PERL" = x],     [mm_missing=Perl],
+        [test "x$DOT" = x],      [mm_missing=dot],
+        [test "x$DOXYGEN" = x],  [mm_missing=Doxygen],
         [test "x$XSLTPROC" = x], [mm_missing=xsltproc],
         [mm_missing=])
   AS_IF([test -n "$mm_missing"], [AC_MSG_FAILURE([[
 *** Documentation is enabled in this configuration, but the
-*** required tool ${mm_missing} could not be found.]])])
+*** required tool $mm_missing could not be found.]])])[]dnl
 ])
-AM_CONDITIONAL([$1], [test "x$$1" != xno])
+AM_CONDITIONAL([$1], [test "x[$]$1" != xno])[]dnl
 ])
 
 ## MM_ARG_ENABLE_DOCUMENTATION([variable])
@@ -52,10 +60,9 @@ AM_CONDITIONAL([$1], [test "x$$1" != xno])
 ## disabled, also check whether the necessary tools are installed, and
 ## abort if any are missing.
 ##
-## The tools checked for are doxygen and xsltproc.  The substitution
-## variables DOXYGEN and XSLTPROC are set to the command names, unless
-## overridden in the user environment.  Note that Doxygen is a hard
-## dependency only in maintainer mode if the option is provided.
+## The tools checked for are Perl, dot, Doxygen and xsltproc.  The
+## substitution variables PERL, DOT, DOXYGEN and XSLTPROC are set to
+## the command names, unless overridden in the user environment.
 ##
 AC_DEFUN([MM_ARG_ENABLE_DOCUMENTATION],
          [_MM_ARG_ENABLE_DOCUMENTATION(m4_default([$1], [ENABLE_DOCUMENTATION]))])
diff --git a/configure.ac b/configure.ac
index c601acb..0da6da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,12 +46,9 @@ MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 # Locate gmmproc directory
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
-# Doxygen needs the path to the installed Perl
-GLIBMM_CHECK_PERL([5.6.0])
 MM_ARG_ENABLE_DOCUMENTATION
 
 AC_LANG([C++])
-
 DK_ARG_ENABLE_WARNINGS([LIBRSVGMM_WXXFLAGS],
                        [-Wall],
                        [-pedantic -Wall -Wextra],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]