From 199a14150bbcb6d1b5e8c62fdde45c9dd29f8f78 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 29 May 2008 20:30:44 +0000 Subject: [PATCH] Removed redundant targets --- examples/sky-ip/Makefile | 1 + examples/sky-shell/Makefile | 16 ---------------- examples/sky/Makefile | 9 +++++---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/examples/sky-ip/Makefile b/examples/sky-ip/Makefile index bd906e360..91fe6cc76 100644 --- a/examples/sky-ip/Makefile +++ b/examples/sky-ip/Makefile @@ -1,4 +1,5 @@ CONTIKI_PROJECT = telnet-webserver +DEFAULT_TARGET=sky all: $(CONTIKI_PROJECT) APPS = telnetd webserver diff --git a/examples/sky-shell/Makefile b/examples/sky-shell/Makefile index 49ff1fd43..05a167bbe 100644 --- a/examples/sky-shell/Makefile +++ b/examples/sky-shell/Makefile @@ -4,14 +4,6 @@ all: $(CONTIKI_PROJECT) APPS = shell CONTIKI = ../.. -ifdef MOTE -login: - $(SERIALDUMP) -b115200 /dev/com$(word $(MOTE), $(CMOTES)) -else -login: - $(SERIALDUMP) -b115200 /dev/com$(firstword $(CMOTES)) -endif - %.shell-upload: %.ce (echo; sleep 4; echo "~K"; sleep 4; \ echo "dec64 | write file | null"; sleep 4; \ @@ -107,11 +99,3 @@ collect-energy: echo 'collect | timestamp | write file | hd &') | make login include $(CONTIKI)/Makefile.include - -sizeplot: - msp430-size $(OBJECTDIR)/*.o | $(CONTIKI)/tools/sky/check-size > size-data && \ - gnuplot $(CONTIKI)/tools/sky/plot-size && gv size.pdf - -sizeacro: - msp430-size $(OBJECTDIR)/*.o | $(CONTIKI)/tools/sky/check-size > size-data && \ - gnuplot $(CONTIKI)/tools/sky/plot-size && rundll32 url.dll,FileProtocolHandler size.pdf diff --git a/examples/sky/Makefile b/examples/sky/Makefile index dd81ef954..aba2bb3a1 100644 --- a/examples/sky/Makefile +++ b/examples/sky/Makefile @@ -3,11 +3,12 @@ ifndef TARGET TARGET=sky endif -#APPS=rudolph - all: blink sky-collect #rt-leds test-button test-cfs tcprudolph0 -serialdump: - $(SERIALDUMP) -b115200 /dev/com$(firstword $(CMOTES)) | $(CONTIKI)/tools/timestamp | tee serialdump-`date +%Y%m%d-%H%M` +%.tgz: %.ihex + mkdir $(basename $<) ; \ + mv $< $(basename $<) ; \ + echo $(basename $<)/$(basename $<).ihex 600 > $(basename $<)/runfile ; \ + tar czf $@ $(basename $<) include $(CONTIKI)/Makefile.include