4 files changed, 57 insertions, 23 deletions

diff --git a/tools/checkwps/Makefile b/tools/checkwps/Makefile
index 2f127af618..faa75efac3 100644
--- a/tools/checkwps/Makefile
+++ b/tools/checkwps/Makefile
@@ -7,8 +7,6 @@
 # $Id$
 #
 
-ROOT=../..
-
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
 CFLAGS+=-mno-cygwin
 EXT = .exe
@@ -19,28 +17,20 @@ CC = mingw32-gcc
 endif
 endif
 
-COMMON=$(ROOT)/apps/gui/skin_engine/wps_debug.c \
-       $(ROOT)/apps/gui/skin_engine/skin_parser.c \
-       $(ROOT)/apps/gui/skin_engine/skin_buffer.c \
-       $(ROOT)/apps/misc.c \
-       $(ROOT)/apps/recorder/bmp.c \
-       $(ROOT)/firmware/common/strlcpy.c
-
-INCLUDE=-I $(ROOT)/apps/gui \
-        -I $(ROOT)/apps/gui/skin_engine \
-        -I $(ROOT)/firmware/export \
-        -I $(ROOT)/apps \
-        -I $(ROOT)/apps/recorder \
-        -I .
-
-CFLAGS = -g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\"
+# This is a wrapper for checkwps.make
+APPSDIR=.
+ROOTDIR=../..
+BUILDDIR=.
+BINARY=checkwps.$(MODELNAME)$(EXT)
+HOSTCC=$(CC)
+TARGET=-D$(TARGETNAME)
+include checkwps.make
 
 all:
         @echo To build, run the buildall.sh script
 
-checkwps: checkwps.c  $(COMMON)
-        @echo CC [$(TARGET)]
-        @$(CC) $(INCLUDE) $(CFLAGS) $(COMMON) -D$(TARGET) checkwps.c -o $@.$(MODEL)$(EXT)
+checkwps: $(BUILDDIR)/$(BINARY)
+        @echo foo > /dev/null
 
 clean:
-        rm -f checkwps.$(MODEL)$(EXT)
+        rm -f checkwps.$(MODELNAME)$(EXT)
diff --git a/tools/checkwps/buildall.sh b/tools/checkwps/buildall.sh
index 8d0ad9fd21..b66bee224c 100755
--- a/tools/checkwps/buildall.sh
+++ b/tools/checkwps/buildall.sh
@@ -5,7 +5,7 @@ cat $rootdir/targets.txt | (
     while read target model
     do
         rm -f checkwps.$model
-        make -s -C $rootdir MODEL=$model TARGET=$target checkwps
+        make -s -C $rootdir MODELNAME=$model TARGETNAME=$target checkwps
         mv $rootdir/checkwps.$model ./checkwps.$model > /dev/null 2>&1
     done
 )
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
new file mode 100644
index 0000000000..87144453a5
--- /dev/null
+++ b/tools/checkwps/checkwps.make
@@ -0,0 +1,34 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+
+FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\"
+
+COMMON = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \
+         $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \
+         $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \
+         $(ROOTDIR)/apps/misc.c \
+         $(ROOTDIR)/apps/recorder/bmp.c \
+         $(ROOTDIR)/firmware/common/strlcpy.c
+
+INCLUDE = -I $(ROOTDIR)/apps/gui \
+          -I $(ROOTDIR)/apps/gui/skin_engine \
+          -I $(ROOTDIR)/firmware/export \
+          -I $(ROOTDIR)/apps \
+          -I $(ROOTDIR)/apps/recorder \
+          -I $(APPSDIR)
+
+# Makes mkdepfile happy
+GCCOPTS+=-D__PCTOOL__
+SRC=$(APPSDIR)/checkwps.c $(COMMON)
+OTHER_SRC=$(SRC)
+ASMDEFS_SRC=$(SRC)
+
+$(BUILDDIR)/$(BINARY): $(APPSDIR)/checkwps.c  $(COMMON)
+        @echo CC $(BINARY)
+        @$(HOSTCC) $(INCLUDE) $(FLAGS) $(COMMON) $(TARGET) $(APPSDIR)/checkwps.c -o $@
diff --git a/tools/configure b/tools/configure
index 486a4706db..2f96f377e5 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2430,7 +2430,7 @@ esac
 if [ "$ARG_TYPE" ]; then
   btype=$ARG_TYPE
 else
-  echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, $gdbstub(M)anual: (Defaults to N)"
+  echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, (C)heckWPS, $gdbstub(M)anual: (Defaults to N)"
   btype=`input`;
 fi
 
@@ -2511,6 +2511,16 @@ fi
       apps="manual"
       echo "Manual build selected"
       ;;
+    [Cc])
+      uname=`uname`
+      simcc
+      toolset='';
+      t_cpu='';
+      GCCOPTS='';
+      appsdir='\$(ROOTDIR)/tools/checkwps';
+      output='checkwps.'${modelname};
+      echo "CheckWPS build selected"
+      ;;
     *)
       if [ "$modelname" = "e200r" ]; then
           echo "Do not use the e200R target for regular builds.  Use e200 instead."