Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

[sliver-openvswitch.git] / planetlab / exp-tool / Makefile

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 97a4438..3ab2709 100644 (file)
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -513,7 +513,8 @@ help:
 
 # external nodes and links
 #
-EXTERNAL_LINKS := $(filter $(foreach host,$(EXTERNAL_HOSTS),%-$(host)),$(LINKS))
+ALL_LINKS := $(LINKS) $(patsubst L/%,%,$(filter L/%,$(MAKECMDGOALS)))
+EXTERNAL_LINKS := $(filter $(foreach host,$(EXTERNAL_HOSTS),%-$(host)),$(ALL_LINKS))
 
 $(foreach host,$(EXTERNAL_HOSTS),sshcheck-$(host)): ;
 $(foreach host,$(EXTERNAL_HOSTS),ovsversion-$(host)): ;
@@ -528,13 +529,14 @@ $(foreach host,$(EXTERNAL_HOSTS),cache/bridge.$(host)): ;
 $(foreach host,$(EXTERNAL_HOSTS),cache/switch.$(host)): ;
 $(foreach host,$(EXTERNAL_HOSTS),cache/controller.$(host)): ;
 $(foreach link,$(EXTERNAL_LINKS),cache/iface.$(link)@2): ;
-$(foreach link,$(EXTERNAL_LINKS),cache/endpoint.$(link)@2): ;
+$(foreach link,$(EXTERNAL_LINKS),cache/port.$(link)@2): ;
+$(foreach link,$(EXTERNAL_LINKS),del-iface.$(link)@2): ;
 
 # we assume that a program called tunproxy is available on the
 # external nodes.  
 
 .SECONDEXPANSION:
-$(foreach link,$(EXTERNAL_LINKS),cache/port.$(link)@2): cache/port.%@2: cache/port.%@1 cache/host.$$(call leftnode,%)
+$(foreach link,$(EXTERNAL_LINKS),cache/endpoint.$(link)@2): cache/endpoint.%@2: cache/port.%@1 cache/host.$$(call leftnode,%)
        @#echo $* [$<] [$^] $(call rightnode,$*)
        @echo $(call default,EXTERNAL_PORT,$(call rightnode,$*)) > $@
        @echo "===>" $(call rightnode,$*): \