[farsight2/master] Clean up the stamp file if srcdir!=builddir

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:25:24 PST 2008


---
 common/gtk-doc-plugins.mak |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak
index a9c6296..7d0d48e 100644
--- a/common/gtk-doc-plugins.mak
+++ b/common/gtk-doc-plugins.mak
@@ -259,6 +259,7 @@ clean-local-gtkdoc:
 # clean files copied for nonsrcdir templates build
 	if test x"$(srcdir)" != x. ; then \
 	    rm -rf $(SCANOBJ_FILES) $(SCAN_FILES); \
+	    rm -f *.stamp; \
 	fi
 else
 all-local:
@@ -368,13 +369,7 @@ scanobj-trans-update:
 
 scanobj-trans-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
 	@echo '*** Scanning GObjects ***'
-	if test x"$(srcdir)" != x. ; then				\
-	    for f in $(SCANOBJ_FILES);					\
-	    do								\
-	    	pwd \
-	        cp $(srcdir)/$$f . ;					\
-	    done;							\
-	else								\
+	if test x"$(srcdir)" = x. ; then				\
 	    GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext	\
 	    GST_REGISTRY=$(INSPECT_REGISTRY)				\
 	    FS_PLUGIN_PATH="$(FS_PLUGIN_PATH)"				\
-- 
1.5.6.5




More information about the farsight-commits mailing list