convenience

diff --git a/Makefile b/Makefile
index c122cf3..dfd3a8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ force:
 
 ##########
 tags:  
-       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$|~$$' | xargs etags
+       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$|~$$|\.png$$|\.svg$$|\.out$$' | xargs etags
 .PHONY: tags
 
 signatures:

diff --git a/sfa/client/Makefile b/sfa/client/Makefile
index d9087da..420543f 100644 (file)
--- a/sfa/client/Makefile
+++ b/sfa/client/Makefile
@@ -1,23 +1,23 @@
-BUNDLES += http://planet-lab.eu:12345/@sfa-ple-reg 
-BUNDLES += http://planet-lab.eu:12346/@sfa-ple-am
-BUNDLES += http://planet-lab.eu:12347/@sfa-ple-sa
-BUNDLES += http://planet-lab.org:12345/@sfa-plc-reg 
-BUNDLES += http://planet-lab.org:12346/@sfa-plc-am
-BUNDLES += http://planet-lab.org:12347/@sfa-plc-sa
-BUNDLES += http://planet-lab.kr:12345/@sfa-ppk-reg 
-BUNDLES += http://planet-lab.kr:12346/@sfa-ppk-am
-BUNDLES += http://planet-lab.kr:12347/@sfa-ppk-sa
-BUNDLES += http://planet-lab.jp:12345/@sfa-plj-reg 
-BUNDLES += http://planet-lab.jp:12346/@sfa-plj-am
-BUNDLES += http://planet-lab.jp:12347/@sfa-plj-sa
-BUNDLES += http://geni-myvini.umkc.gpeni.net:12345/@sfa-gpeni-reg
-BUNDLES += http://geni-myvini.umkc.gpeni.net:12346/@sfa-gpeni-am
-BUNDLES += http://geni-myvini.umkc.gpeni.net:12347/@sfa-gpeni-sa
-BUNDLES += http://198.248.241.100:12345/@sfa-glc-reg
-BUNDLES += http://198.248.241.100:12346/@sfa-glc-am
-BUNDLES += http://198.248.241.100:12347/@sfa-glc-sa
-
-EXTENSIONS := png svg
+# recompute the SFA graphs from different locations
+
+BUNDLES += http://planet-lab.eu:12345/@auto-ple-reg 
+BUNDLES += http://planet-lab.eu:12347/@auto-ple-sa
+BUNDLES += http://planet-lab.org:12345/@auto-plc-reg 
+BUNDLES += http://planet-lab.org:12347/@auto-plc-sa
+BUNDLES += http://planet-lab.kr:12345/@auto-ppk-reg 
+BUNDLES += http://planet-lab.kr:12347/@auto-ppk-sa
+BUNDLES += http://www.planet-lab.jp:12345/@auto-plj-reg 
+BUNDLES += http://www.planet-lab.jp:12347/@auto-plj-sa
+BUNDLES += http://geni-myvini.umkc.gpeni.net:12345/@auto-gpeni-reg
+BUNDLES += http://geni-myvini.umkc.gpeni.net:12347/@auto-gpeni-sa
+BUNDLES += http://198.248.241.100:12345/@auto-glc-reg
+BUNDLES += http://198.248.241.100:12347/@auto-glc-sa
+BUNDLES += http://vini-veritas.net:12345/@auto-vini-reg
+BUNDLES += http://vini-veritas.net:12347/@auto-vini-sa
+
+# dont output svg yet
+#EXTENSIONS := png svg
+EXTENSIONS := png 
 
 define bundle_scan_target
 $(word 2,$(subst @, ,$(1))):
@@ -36,7 +36,7 @@ $(foreach bundle,$(BUNDLES),$(eval $(call bundle_scan_target,$(bundle))))
 
 define bundle_version_target
 $(word 2,$(subst @, ,$(1))).version:
-       ./sfi.py -s $(word 1,$(subst @, ,$(1))) version >& $$@
+       -./sfi.py -s $(word 1,$(subst @, ,$(1))) version >& $$@
 endef
 
 VERSIONS := $(foreach bundle,$(BUNDLES),$(word 2,$(subst @, ,$(bundle))).version)