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

a minor glitch (apps setting) has been fixed

Browse source
This commit is contained in:
matsutsuka 2007-11-28 10:03:40 +00:00
parent 5318ab9e2e
commit 16f9b124c4
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/pc-6001/Makefile
View file

@ -2,7 +2,7 @@
# Makefile for PC-6001 using z80/SDCC
# @author Takahide Matsutsuka <markn@markn.org>
#
# $Id: Makefile,v 1.4 2007/11/28 09:43:01 matsutsuka Exp $
# $Id: Makefile,v 1.5 2007/11/28 10:03:40 matsutsuka Exp $
#
CONTIKI = ../..
@ -17,9 +17,16 @@ APPS_NETWORK_SERVER = cmdd telnetd shell www
PLATFORM_APPS_DESKTOP = multithread tinysample
PLATFORM_APPS_NETWORK = webserver-mini
APPS = $(APPS_DESKTOP)
PLATFORM_APPS=$(PLATFORM_APPS_DESKTOP)
ifeq ($(MAKECMDGOALS),client)
APPS = $(APPS_NETWORK_CLIENT)
else ifeq ($(MAKECMDGOALS),server)
APPS = $(APPS_NETWORK_SERVER)
else
APPS = $(APPS_DESKTOP)
endif
all : p6
p6 : contiki

6
platform/pc-6001/Makefile.pc-6001
View file

@ -2,7 +2,7 @@
# Makefile for PC-6001 using z80/SDCC
# @author Takahide Matsutsuka <markn@markn.org>
#
# $Id: Makefile.pc-6001,v 1.5 2007/11/28 09:43:01 matsutsuka Exp $
# $Id: Makefile.pc-6001,v 1.6 2007/11/28 10:03:40 matsutsuka Exp $
#
ifndef CONTIKI
@ -12,7 +12,6 @@ endif
# Default values
ARCH=PC6001
MEMORY=32K
APPS = $(APPS_DESKTOP)
PLATFORM_APPS=$(PLATFORM_APPS_DESKTOP)
CONTIKI_TARGET_MAIN = contiki-main.c
CTKCONF = NORMAL
@ -38,12 +37,11 @@ else ifeq ($(MAKECMDGOALS),load)
LOADER = 1
CONTIKI_TARGET_MAIN=contiki-loader-main.c
else ifeq ($(MAKECMDGOALS),server)
CTKCONF=SERVER APPS="$(APPS_NETWORK_SERVER)"
CTKCONF=SERVER
PLATFORM_APPS="$(PLATFORM_APPS_NETWORK)"
CONTIKI_TARGET_MAIN=contiki-server-main.c
else ifeq ($(MAKECMDGOALS),client)
CTKCONF=CLIENT
APPS="$(APPS_NETWORK_CLIENT)"
PLATFORM_APPS="$(PLATFORM_APPS_NETWORK)"
CONTIKI_TARGET_MAIN=contiki-client-main.c
endif