deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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.

Browse source
This commit is contained in:
oliverschmidt 2008-05-26 10:09:12 +00:00
parent 1cab294517
commit 4dcbc3273e
15 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.include
View file

@ -8,11 +8,8 @@ CFLAGS += -DCONTIKI_TARGET=$(TARGET)
ifeq ($(TARGET),) ifeq ($(TARGET),)
-include Makefile.target -include Makefile.target
ifeq ($(TARGET),) ifeq ($(TARGET),)
ifeq ($(DEFAULT_TARGET),) ${info TARGET not defined, using target 'native'}
DEFAULT_TARGET=native TARGET=native
endif
${info TARGET not defined, using target '$(DEFAULT_TARGET)'}
TARGET=$(DEFAULT_TARGET)
else else
${info using saved target '$(TARGET)'} ${info using saved target '$(TARGET)'}
endif endif

2
examples/esb/Makefile
View file

@ -1,7 +1,5 @@
CONTIKI_PROJECT = blinker CONTIKI_PROJECT = blinker
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
DEFAULT_TARGET = esb
CONTIKI = ../.. CONTIKI = ../..
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

1
examples/esb/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = esb

2
examples/sky-ip/Makefile
View file

@ -2,8 +2,6 @@ CONTIKI_PROJECT = telnet-webserver
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
APPS = telnetd webserver APPS = telnetd webserver
DEFAULT_TARGET = sky
CFLAGS = -DWITH_UIP=1 #-DWITH_NULLMAC=1 CFLAGS = -DWITH_UIP=1 #-DWITH_NULLMAC=1
# The webserver application normally contains a built-in file system and support # The webserver application normally contains a built-in file system and support

1
examples/sky-ip/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = sky

2
examples/sky-shell/Makefile
View file

@ -2,8 +2,6 @@ CONTIKI_PROJECT = sky-shell
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
APPS = shell APPS = shell
DEFAULT_TARGET = sky
CONTIKI = ../.. CONTIKI = ../..
ifdef MOTE ifdef MOTE

1
examples/sky-shell/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = sky

1
examples/telnet-server/Makefile
View file

@ -2,7 +2,6 @@ CONTIKI_PROJECT = telnet-server
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
APPS = telnetd program-handler APPS = telnetd program-handler
DEFAULT_TARGET = minimal-net
CONTIKI = ../.. CONTIKI = ../..
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

1
examples/telnet-server/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = minimal-net

1
examples/test-ipv6/Makefile
View file

@ -2,7 +2,6 @@ CONTIKI_PROJECT = testv6
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
APPS = webserver APPS = webserver
DEFAULT_TARGET = minimal-net
CFLAGS = -DUIP_CONF_IPV6 CFLAGS = -DUIP_CONF_IPV6
CONTIKI = ../.. CONTIKI = ../..

1
examples/test-ipv6/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = minimal-net

1
examples/webbrowser/Makefile
View file

@ -2,7 +2,6 @@ CONTIKI_PROJECT = webbrowser
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
APPS = webbrowser APPS = webbrowser
DEFAULT_TARGET = win32
CONTIKI = ../.. CONTIKI = ../..
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

1
examples/webbrowser/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = win32

1
examples/webserver/Makefile
View file

@ -2,7 +2,6 @@ CONTIKI_PROJECT = webserver-example
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
APPS = webserver APPS = webserver
DEFAULT_TARGET = minimal-net
# The webserver application normally contains a built-in file system and support # The webserver application normally contains a built-in file system and support
# for server-side includes. # for server-side includes.

1
examples/webserver/Makefile.target Normal file
View file

@ -0,0 +1 @@
TARGET = minimal-net