summaryrefslogtreecommitdiff
path: root/gtk-doc-plugins.mak
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-09-23 13:57:28 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-09-23 13:57:28 +0000
commit345fd9851051274dd758a19bbe33dbb561b4d303 (patch)
tree337601c8ad182aef94a538bcc26aa18f9840436a /gtk-doc-plugins.mak
parentb1ac65c3358773d726fd41ab3b7f7a63db001c88 (diff)
merge additions from the .signals.new and .args.new file in the original ones, only updating if necessary
Original commit message from CVS: merge additions from the .signals.new and .args.new file in the original ones, only updating if necessary
Diffstat (limited to 'gtk-doc-plugins.mak')
-rw-r--r--gtk-doc-plugins.mak4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 0067538..66047b9 100644
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -97,7 +97,9 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" \
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