diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2011-09-06 14:07:12 +0200 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2011-09-06 14:08:11 +0200 |
| commit | a39eb835fb3be2a4c5a6a89b5ca5cc064e79b2e2 (patch) | |
| tree | be7bc9c07dc40c301eb9f110e629cf3736e0250e | |
| parent | 0f0762bb4a16436440566d92e0d76c5111514668 (diff) | |
| download | gstreamer-common-a39eb835fb3be2a4c5a6a89b5ca5cc064e79b2e2.tar.gz | |
docs: support multiple source-dirs like we do in upstream
This lets us specify gst,ext,sys dirs for plugin docs.
| -rw-r--r-- | gtk-doc-plugins.mak | 6 | ||||
| -rw-r--r-- | gtk-doc.mak | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index 18155f0..5a8eb94 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -151,10 +151,14 @@ scan-build.stamp: $(HFILE_GLOB) $(EXTRA_HFILES) $(basefiles) scanobj-build.stamp if test -e $(srcdir)/$$f; then cp -u $(srcdir)/$$f . ; fi; \ done; \ fi + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ @gtkdoc-scan \ $(SCAN_OPTIONS) $(EXTRA_HFILES) \ --module=$(DOC_MODULE) \ - --source-dir=$(DOC_SOURCE_DIR) \ + $${_source_dir} \ --ignore-headers="$(IGNORE_HFILES)"; \ touch scan-build.stamp diff --git a/gtk-doc.mak b/gtk-doc.mak index 47f5d9d..dd2b5a5 100644 --- a/gtk-doc.mak +++ b/gtk-doc.mak @@ -70,15 +70,14 @@ setup-build.stamp: $(content_files) # to gtk-doc scanning; but only then, to avoid duplicates scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo ' DOC Scanning header files' - @if test "x$(top_srcdir)" != "x$(top_builddir)"; \ - then \ - export BUILT_OPTIONS="--source-dir=$(DOC_BUILD_DIR)"; \ - fi; \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ gtkdoc-scan \ $(SCAN_OPTIONS) $(EXTRA_HFILES) \ --module=$(DOC_MODULE) \ - --source-dir=$(DOC_SOURCE_DIR) \ - $$BUILT_OPTIONS \ + $${_source_dir} \ --ignore-headers="$(IGNORE_HFILES)" @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null; then \ echo " DOC Introspecting gobjects"; \ |