From ac22ad5081ba25ce26a6c29cc52cfd2810f6dda1 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Thu, 26 Mar 2009 13:29:44 +0000
Subject: [PATCH] changed the Makefile rules for uploading to sky-nodes.

the earlier approach caused problems sometimes, resulting in command succeeding without all nodes being reprogrammed
---
 platform/sky/Makefile.sky | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/platform/sky/Makefile.sky b/platform/sky/Makefile.sky
index cc4bfff8d..53193e8d6 100644
--- a/platform/sky/Makefile.sky
+++ b/platform/sky/Makefile.sky
@@ -1,4 +1,4 @@
-# $Id: Makefile.sky,v 1.21 2009/02/04 17:51:49 fros4943 Exp $
+# $Id: Makefile.sky,v 1.22 2009/03/26 13:29:44 fros4943 Exp $
 
 
 ARCH=msp430.c leds.c watchdog.c light.c spi.c ds2411.c \
@@ -74,25 +74,25 @@ sky-motes:
 sky-upload: sky-reset
 	$(MAKE) -j $(NUMPAR) sky-upload-sequence
 
-sky-upload-sequence:	$(foreach PORT, $(MOTES), $(PORT).sky-u)
+sky-upload-sequence:	$(foreach PORT, $(MOTES), sky-u.$(PORT))
 	@echo Done
 
 sky-reset:
 	$(MAKE) -k -j $(NUMPAR) sky-reset-sequence
 
-sky-reset-sequence:	$(foreach PORT, $(MOTES), $(PORT).sky-r)
+sky-reset-sequence:	$(foreach PORT, $(MOTES), sky-r.$(PORT))
 	@echo Done
 
-%.sky-u:
-	@echo +++++ Erasing $(basename $@) ; \
-	$(BSL) -c $(basename $@) -e && sleep 2 ; \
-	echo +++++ Programming $(basename $@) ; \
-	$(BSL) -c $(basename $@) $(BSL_FILETYPE) -p $(IHEXFILE) && sleep 2 ; \
-	echo +++++ Resetting $(basename $@) ; \
-	$(BSL) -c $(basename $@) -r
+sky-u.%:
+	@echo +++++ Erasing $* ; \
+	$(BSL) -c $* -e && sleep 2 ; \
+	echo +++++ Programming $* ; \
+	$(BSL) -c $* $(BSL_FILETYPE) -p $(IHEXFILE) && sleep 2 ; \
+	echo +++++ Resetting $* ; \
+	$(BSL) -c $* -r
 
-%.sky-r:
-	$(BSL) -c $(basename $@) -r
+sky-r.%:
+	$(BSL) -c $* -r
 
 sizeplot:
 	msp430-size $(OBJECTDIR)/*.o | $(CONTIKI)/tools/sky/check-size > size-data