common: distcheck: fix distcheck

Stefan Kost ensonic at kemper.freedesktop.org
Fri Mar 25 05:54:41 PDT 2011


Module: common
Branch: master
Commit: 193b7176e61160d78a967884f1b20af76d1c7379
URL:    http://cgit.freedesktop.org/gstreamer/common/commit/?id=193b7176e61160d78a967884f1b20af76d1c7379

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Fri Mar 25 14:51:45 2011 +0200

distcheck: fix distcheck

Clean inspect files. Don't leave *{args,signals}.new files.

---

 gstdoc-scangobj     |    4 ++--
 gtk-doc-plugins.mak |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gstdoc-scangobj b/gstdoc-scangobj
index f6b6ffe..e7a0f76 100755
--- a/gstdoc-scangobj
+++ b/gstdoc-scangobj
@@ -1563,9 +1563,9 @@ if (!defined($ENV{"GTK_DOC_KEEP_INTERMEDIATE"})) {
 }
 
 #&UpdateFileIfChanged ($old_signals_filename, $new_signals_filename, 0);
+unlink $new_signals_filename;
 &UpdateFileIfChanged ($old_hierarchy_filename, $new_hierarchy_filename, 0);
 &UpdateFileIfChanged ($old_interfaces_filename, $new_interfaces_filename, 0);
 &UpdateFileIfChanged ($old_prerequisites_filename, $new_prerequisites_filename, 0);
 #&UpdateFileIfChanged ($old_args_filename, $new_args_filename, 0);
-
-
+unlink $new_args_filename;
diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index a1d81ba..0c0019c 100644
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -121,7 +121,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) inspect
 	@if test x"$(srcdir)" != x. ; then				\
 	    for f in $(SCANOBJ_FILES) $(SCAN_FILES);			\
 	    do								\
-	        cp $(srcdir)/$$f . ;					\
+	        if test -e $(srcdir)/$$f; then cp -u $(srcdir)/$$f . ; fi;	\
 	    done;							\
 	fi;								\
 	$(INSPECT_ENVIRONMENT) 					\
@@ -163,7 +163,7 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections
 	@if test x"$(srcdir)" != x. ; then				\
 	    for f in $(SCANOBJ_FILES) $(SCAN_FILES);			\
 	    do								\
-	        if test -e $(srcdir)/$$f; then cp -u $(srcdir)/$$f . ; fi; \
+	        if test -e $(srcdir)/$$f; then cp -u $(srcdir)/$$f . ; fi;	\
 	    done;							\
 	fi
 	gtkdoc-mktmpl --module=$(DOC_MODULE) | tee tmpl-build.log
@@ -257,6 +257,7 @@ distclean-local:
 	    rm -f $(DOC_MODULE).prerequisites ; \
 	    rm -f $(DOC_MODULE)-sections.txt ; \
 	    rm -rf tmpl/*.sgml ; \
+	    rm -rf $(INSPECT_DIR); \
 	fi
 	rm -rf *.o
 



More information about the gstreamer-commits mailing list