From b77dc098f9eb23abd50ded3ce9e34199c7b0c16c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 18 May 2011 23:07:16 +0300 Subject: [PATCH] docs: only use --verbose on gtkdoc-mkhtml where supported This would require gtk-doc >=1.18 (unreleased yet) and we don't want to do that for cosmetic fixes. --- gtk-doc-plugins.mak | 7 +++++-- gtk-doc.mak | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index ad06a19..cdf19ee 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -207,8 +207,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @cp -pr xml html @cp ../version.entities html @mkhtml_options=""; \ - if test "x$(V)" = "x1"; then \ - mkhtml_options="--verbose"; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) @mv html/index.sgml html/index.sgml.bak diff --git a/gtk-doc.mak b/gtk-doc.mak index 63e8957..b37ad4b 100644 --- a/gtk-doc.mak +++ b/gtk-doc.mak @@ -121,6 +121,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @cp -pr xml html @cp ../version.entities ./ @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ @gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ mkhtml_options=--path="$(abs_srcdir)"; \ -- 2.7.4