m4: Don't use -Wno-non-virtual-dtor for objc

[platform/upstream/gst-common.git] / gtk-doc.mak

diff --git a/gtk-doc.mak b/gtk-doc.mak
index b37ad4b..31b56f9 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -12,7 +12,7 @@
 GPATH = $(srcdir)
 
 # thomas: make docs parallel installable
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_API_VERSION@
 
 EXTRA_DIST =                           \
        $(content_files)                \
@@ -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"; \
@@ -133,7 +132,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        fi; \
        cd html && gtkdoc-mkhtml $$mkhtml_options $(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
+       @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_API_VERSION@\//g" html/index.sgml.bak >html/index.sgml
        @rm -f html/index.sgml.bak
        @rm -rf html/xml
        @rm -f version.entities
@@ -170,6 +169,7 @@ distclean-local:
            rm -f $(DOC_MODULE).interfaces ; \
            rm -f $(DOC_MODULE).prerequisites ; \
            rm -f $(DOC_MODULE)-sections.txt ; \
+           rm -f $(content_files) ; \
            rm -rf tmpl/*.sgml ; \
        fi
        @rm -rf *.o
@@ -192,7 +192,7 @@ install-data-local:
          echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
          if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
                    $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \
          fi; \
          (which gtkdoc-rebase >/dev/null && \
            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \