From 16f9b124c4e897614b5fd378bb128f411f6b3f05 Mon Sep 17 00:00:00 2001
From: matsutsuka <matsutsuka>
Date: Wed, 28 Nov 2007 10:03:40 +0000
Subject: [PATCH] a minor glitch (apps setting) has been fixed

---
 platform/pc-6001/Makefile         | 11 +++++++++--
 platform/pc-6001/Makefile.pc-6001 |  6 ++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/platform/pc-6001/Makefile b/platform/pc-6001/Makefile
index 9527199f3..283b7a74f 100644
--- a/platform/pc-6001/Makefile
+++ b/platform/pc-6001/Makefile
@@ -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
diff --git a/platform/pc-6001/Makefile.pc-6001 b/platform/pc-6001/Makefile.pc-6001
index f83e59d0a..d4d7ed556 100644
--- a/platform/pc-6001/Makefile.pc-6001
+++ b/platform/pc-6001/Makefile.pc-6001
@@ -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