Now that we started adding files to the CVS which are normally generated with a 'save...' make goal we can remove the DEFAULT_TARGET mechanism altogether and just add Makefile.target files.

2008-05-26 10:09:12 +00:00 · 2008-05-26 10:09:12 +00:00 · 4dcbc3273e
commit 4dcbc3273e
parent 1cab294517
15 changed files with 9 additions and 15 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -8,11 +8,8 @@ CFLAGS += -DCONTIKI_TARGET=$(TARGET)
 ifeq ($(TARGET),)
  -include Makefile.target
  ifeq ($(TARGET),)
-    ifeq ($(DEFAULT_TARGET),)
-      DEFAULT_TARGET=native
-    endif
-    ${info TARGET not defined, using target '$(DEFAULT_TARGET)'}
-    TARGET=$(DEFAULT_TARGET)
+    ${info TARGET not defined, using target 'native'}
+    TARGET=native
  else
    ${info using saved target '$(TARGET)'}
  endif
--- a/examples/esb/Makefile
+++ b/examples/esb/Makefile
@ -1,7 +1,5 @@
 CONTIKI_PROJECT = blinker
 all: $(CONTIKI_PROJECT)

-DEFAULT_TARGET = esb
-
 CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
--- a/examples/esb/Makefile.target
+++ b/examples/esb/Makefile.target
@ -0,0 +1 @@
+TARGET = esb
--- a/examples/sky-ip/Makefile
+++ b/examples/sky-ip/Makefile
@ -2,8 +2,6 @@ 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-ip/Makefile.target
+++ b/examples/sky-ip/Makefile.target
@ -0,0 +1 @@
+TARGET = sky
--- a/examples/sky-shell/Makefile
+++ b/examples/sky-shell/Makefile
@ -2,8 +2,6 @@ CONTIKI_PROJECT = sky-shell
 all: $(CONTIKI_PROJECT)

 APPS = shell
-DEFAULT_TARGET = sky
-
 CONTIKI = ../..

 ifdef MOTE
--- a/examples/sky-shell/Makefile.target
+++ b/examples/sky-shell/Makefile.target
@ -0,0 +1 @@
+TARGET = sky
--- a/examples/telnet-server/Makefile
+++ b/examples/telnet-server/Makefile
@ -2,7 +2,6 @@ CONTIKI_PROJECT = telnet-server
 all: $(CONTIKI_PROJECT)

 APPS = telnetd program-handler
-DEFAULT_TARGET = minimal-net

 CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
--- a/examples/telnet-server/Makefile.target
+++ b/examples/telnet-server/Makefile.target
@ -0,0 +1 @@
+TARGET = minimal-net
--- a/examples/test-ipv6/Makefile
+++ b/examples/test-ipv6/Makefile
@ -2,7 +2,6 @@ CONTIKI_PROJECT = testv6
 all: $(CONTIKI_PROJECT)

 APPS = webserver
-DEFAULT_TARGET = minimal-net
 CFLAGS = -DUIP_CONF_IPV6

 CONTIKI = ../..
--- a/examples/test-ipv6/Makefile.target
+++ b/examples/test-ipv6/Makefile.target
@ -0,0 +1 @@
+TARGET = minimal-net
--- a/examples/webbrowser/Makefile
+++ b/examples/webbrowser/Makefile
@ -2,7 +2,6 @@ CONTIKI_PROJECT = webbrowser
 all: $(CONTIKI_PROJECT)

 APPS = webbrowser
-DEFAULT_TARGET = win32

 CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
--- a/examples/webbrowser/Makefile.target
+++ b/examples/webbrowser/Makefile.target
@ -0,0 +1 @@
+TARGET = win32
--- a/examples/webserver/Makefile
+++ b/examples/webserver/Makefile
@ -2,7 +2,6 @@ CONTIKI_PROJECT = webserver-example
 all: $(CONTIKI_PROJECT)

 APPS = webserver
-DEFAULT_TARGET = minimal-net

 # The webserver application normally contains a built-in file system and support
 # for server-side includes.
--- a/examples/webserver/Makefile.target
+++ b/examples/webserver/Makefile.target
@ -0,0 +1 @@
+TARGET = minimal-net