diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2011-05-18 15:58:48 +0300 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2011-05-18 16:06:05 +0300 |
| commit | 9e5bbd508588961696e70c38e764492e0312ec4c (patch) | |
| tree | dcad3eb8825ae317654d9f08414c8db74659e23a /gtk-doc-plugins.mak | |
| parent | 8e7c77f6a8891ecdb5514a7a391371e0d3f4d8c9 (diff) | |
scangobj, make: behave according to build verbosity
Add --verbose parameter to scangobj (like upstream gtk-doc). Check the flags in
the makefile and pass them to the gtkdoc tools.
Diffstat (limited to 'gtk-doc-plugins.mak')
| -rw-r--r-- | gtk-doc-plugins.mak | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index 766d1d5..0a6a83a 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -124,12 +124,17 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) inspect if test -e $(srcdir)/$$f; then cp -u $(srcdir)/$$f . ; fi; \ done; \ fi; \ + scanobj_options=""; \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ $(INSPECT_ENVIRONMENT) \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" \ CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS) $(WARNING_CFLAGS)" \ LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - $(GST_DOC_SCANOBJ) --type-init-func="gst_init(NULL,NULL)" \ + $(GST_DOC_SCANOBJ) $$scanobj_options --type-init-func="gst_init(NULL,NULL)" \ --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir=$(INSPECT_DIR) && \ + echo " DOC Merging introspection data" && \ $(PYTHON) \ $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE); \ if test x"$(srcdir)" != x. ; then \ @@ -209,7 +214,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @for f in $(content_files); do cp $(srcdir)/$$f html; done @cp -pr xml html @cp ../version.entities html - @cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) + @mkhtml_options=""; \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="--verbose"; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) @mv html/index.sgml html/index.sgml.bak @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml @rm -f html/index.sgml.bak |