[csw-devel] SF.net SVN: gar:[4633] csw/mgar/gar/v2/gar.lib.mk

[dmichelsen at users.sourceforge.net]

Revision: 4633
          http://gar.svn.sourceforge.net/gar/?rev=4633&view=rev
Author:   dmichelsen
Date:     2009-05-01 13:09:55 +0000 (Fri, 01 May 2009)

Log Message:
-----------
mGAR v2: Call bin/upstream_watch only when needed

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.lib.mk

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2009-05-01 03:17:00 UTC (rev 4632)
+++ csw/mgar/gar/v2/gar.lib.mk	2009-05-01 13:09:55 UTC (rev 4633)
@@ -160,12 +160,12 @@
 UPSTREAM_MASTER_SITES ?= $(MASTER_SITES)
 UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES))
 SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF))
-ifneq ($(UFILES_REGEX), "")    
-	FILES2CHECK := $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) 
-else
-	FILES2CHECK := ""
-endif
 
+define files2check
+$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))))
+endef
+
+check-upstream-and-mail: FILES2CHECK = $(call files2check)
 check-upstream-and-mail:
 	@if [ -n '$(FILES2CHECK)' ]; then \
 		NEW_FILES=""; \
@@ -227,6 +227,7 @@
 		fi; \
 	fi
 		
+check-upstream: FILES2CHECK = $(call files2check)
 check-upstream: 
 	@if [ -n '$(FILES2CHECK)' ]; then \
 		NEW_FILES=""; \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.