diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2016-06-20 15:38:01 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2016-06-20 16:54:11 -0400 |
| commit | f363b3205658a38e84fa77f19dee218cd4445275 (patch) | |
| tree | 7b0c51b6840b8c2a6f7c7e1438c8a484f0a6e7a6 | |
| parent | ac2f647695e7bd4b433ea108ee1d0e23901797d4 (diff) | |
Fix handling of DOC_SOURCE_DIR list
As some places we where assuming a single directory. This caused some
plugins documentation to be ignored.
| -rw-r--r-- | gtk-doc-plugins.mak | 8 | ||||
| -rw-r--r-- | gtk-doc.mak | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index fe0977c..4b5dd1b 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -179,9 +179,13 @@ sgml-build.stamp: scan-build.stamp $(CFILE_GLOB) $(top_srcdir)/common/plugins.xs $(top_srcdir)/common/plugins.xsl $$a > xml/`basename $$a`; done @for f in $(EXAMPLE_CFILES); do \ $(PYTHON) $(top_srcdir)/common/c-to-xml.py $$f > xml/element-`basename $$f .c`.xml; done - @gtkdoc-mkdb \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb \ --module=$(DOC_MODULE) \ - --source-dir=$(DOC_SOURCE_DIR) \ + $${_source_dir} \ --expand-content-files="$(expand_content_files)" \ --main-sgml-file=$(srcdir)/$(DOC_MAIN_SGML_FILE) \ --output-format=xml \ diff --git a/gtk-doc.mak b/gtk-doc.mak index 2aab3a9..4beebcf 100644 --- a/gtk-doc.mak +++ b/gtk-doc.mak @@ -121,7 +121,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(expand_content_files) @echo ' DOC Building XML' - @gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) --output-format=xml $(MKDB_OPTIONS) + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) $$(_source_dir) --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) --output-format=xml $(MKDB_OPTIONS) @cp ../version.entities xml @touch sgml-build.stamp |