Many project Makefiles build just one Contiki binary. Up to now the name of this binary was only available to the 'all' goal as prerequisite. So it was possible to create a non-project-specific rule to i.e. load that binary into the target device.

Therefore I introduced the make variable CONTIKI_PROJECT. Now a typical project Makefile starts with: CONTIKI_PROJECT = hello-world all: $(CONTIKI_PROJECT)
2008-05-26 07:37:24 +00:00 · 2008-05-26 07:37:24 +00:00 · b2810f02e1
parent 90797f15a7
commit b2810f02e1
9 changed files with 45 additions and 30 deletions
--- a/examples/esb/Makefile
+++ b/examples/esb/Makefile
@ -1,8 +1,7 @@
+CONTIKI_PROJECT = blinker
+all: $(CONTIKI_PROJECT)
+
+DEFAULT_TARGET = esb
+
 CONTIKI = ../..
-ifndef TARGET
-TARGET=esb
-endif
-
-all: blinker
-
 include $(CONTIKI)/Makefile.include
--- a/examples/hello-world/Makefile
+++ b/examples/hello-world/Makefile
@ -1,4 +1,5 @@
-CONTIKI = ../..
-all: hello-world
+CONTIKI_PROJECT = hello-world
+all: $(CONTIKI_PROJECT)

+CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
--- a/examples/multi-threading/Makefile
+++ b/examples/multi-threading/Makefile
@ -1,4 +1,5 @@
-CONTIKI = ../..
-all: multi-threading
+CONTIKI_PROJECT = multi-threading
+all: $(CONTIKI_PROJECT)

+CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
--- a/examples/sky-ip/Makefile
+++ b/examples/sky-ip/Makefile
@ -1,6 +1,9 @@
-all: telnet-webserver
+CONTIKI_PROJECT = telnet-webserver
+all: $(CONTIKI_PROJECT)
+
 APPS = telnetd webserver
 DEFAULT_TARGET = sky
+
 CFLAGS = -DWITH_UIP=1 #-DWITH_NULLMAC=1

 # The webserver application normally contains a built-in file system and support
--- a/examples/sky-shell/Makefile
+++ b/examples/sky-shell/Makefile
@ -1,7 +1,10 @@
-CONTIKI = ../..
+CONTIKI_PROJECT = sky-shell
+all: $(CONTIKI_PROJECT)
+
 APPS = shell
 DEFAULT_TARGET = sky
-all: sky-shell
+
+CONTIKI = ../..

 ifdef MOTE
 login:
--- a/examples/telnet-server/Makefile
+++ b/examples/telnet-server/Makefile
@ -1,4 +1,6 @@
-all: telnet-server
+CONTIKI_PROJECT = telnet-server
+all: $(CONTIKI_PROJECT)
+
 APPS = telnetd program-handler
 DEFAULT_TARGET = minimal-net

--- a/examples/test-ipv6/Makefile
+++ b/examples/test-ipv6/Makefile
@ -1,4 +1,6 @@
-all: testv6
+CONTIKI_PROJECT = testv6
+all: $(CONTIKI_PROJECT)
+
 APPS = webserver
 DEFAULT_TARGET = minimal-net
 CFLAGS = -DUIP_CONF_IPV6
--- a/examples/webbrowser/Makefile
+++ b/examples/webbrowser/Makefile
@ -1,4 +1,6 @@
-all: webbrowser
+CONTIKI_PROJECT = webbrowser
+all: $(CONTIKI_PROJECT)
+
 APPS = webbrowser
 DEFAULT_TARGET = win32

--- a/examples/webserver/Makefile
+++ b/examples/webserver/Makefile
@ -1,4 +1,6 @@
-all: webserver-example
+CONTIKI_PROJECT = webserver-example
+all: $(CONTIKI_PROJECT)
+
 APPS = webserver
 DEFAULT_TARGET = minimal-net