common/check.mak

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

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 94aedb7..66047b9 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -21,7 +21,6 @@ GPATH = $(srcdir)
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
 
 EXTRA_DIST =                           \
-       scanobj.stamp                   \
        scanobj-build.stamp             \
        $(srcdir)/inspect/*.xml         \
        inspect.stamp                   \
@@ -86,7 +85,7 @@ scanobj-update:
 # TODO: finish elite script that updates the output files of this step
 # instead of rewriting them, so that multiple maintainers can generate
 # a collective set of args and signals
-scanobj-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles)
+scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
        @echo '*** Scanning GObjects ***'
        if test x"$(srcdir)" != x. ; then                               \
            for f in $(SCANOBJ_FILES);                                  \
@@ -94,12 +93,13 @@ scanobj-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles)
                cp $(srcdir)/$$f . ;                                    \
            done;                                                       \
        else                                                            \
-           GST_PLUGIN_PATH=`cd $(top_builddir) && pwd`                 \
-           GST_PLUGIN_PATH_ONLY=1                                      \
+           $(INSPECT_ENVIRONMENT)                                      \
            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)"                         \
-           CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)"          \
+           CFLAGS="-g $(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)"               \
            $(GST_DOC_SCANOBJ) --type-init-func="gst_init(NULL,NULL)"   \
-               --module=$(DOC_MODULE) --source=$(PACKAGE);                             \
+               --module=$(DOC_MODULE) --source=$(PACKAGE) &&           \
+               $(PYTHON)                                               \
+               $(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE);   \
        fi
        touch scanobj-build.stamp
 
@@ -111,7 +111,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(SCANOBJ_FILES_O): scan-build.stamp
 # only look at the plugins in this module when building inspect .xml stuff
 INSPECT_REGISTRY=$(top_builddir)/docs/plugins/inspect-registry.xml
 INSPECT_ENVIRONMENT=\
-        GST_PLUGIN_PATH_ONLY=yes \
+        GST_PLUGIN_SYSTEM_PATH= \
         GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext \
         GST_REGISTRY=$(INSPECT_REGISTRY)
 
@@ -120,6 +120,7 @@ inspect:
        mkdir inspect
 
 inspect-update: inspect
+       -rm $(INSPECT_REGISTRY)
        -rm inspect-build.stamp
        make inspect-build.stamp