summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2009-09-01 14:53:37 +0000
committerBjörn Stenberg <bjorn@haxx.se>2009-09-01 14:53:37 +0000
commitffaf24674d6528606be7a62a1bc7db24d0793e88 (patch)
treeca9f5d44d2e35128c4547d4c1e5105fe48d1ba18 /tools
parentf81cadad2a5cf56cccba2d74d7ad06508f95f2ba (diff)
downloadrockbox-ffaf24674d6528606be7a62a1bc7db24d0793e88.tar.gz
rockbox-ffaf24674d6528606be7a62a1bc7db24d0793e88.tar.bz2
rockbox-ffaf24674d6528606be7a62a1bc7db24d0793e88.zip
Fixed checkwps build warnings. Updated checkwps makefile to be closer to main.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22593 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r--tools/checkwps/checkwps.make38
-rw-r--r--tools/root.make7
2 files changed, 24 insertions, 21 deletions
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index 87144453a5..0a455e9770 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -7,28 +7,28 @@
# $Id$
#
-FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\"
+FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET)
-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
+SRC = $(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 \
+ $(APPSDIR)/checkwps.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)
+INCLUDES = -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 $@
+.SECONDEXPANSION: # $$(OBJ) is not populated until after this
+
+$(BUILDDIR)/$(BINARY): $$(OBJ)
+ @echo LD $(BINARY)
+ $(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -o $@ $+
diff --git a/tools/root.make b/tools/root.make
index 5ba321c952..e2525dc8df 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -54,8 +54,11 @@ all: $(DEPFILE) build
# Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC &
# ASMDEFS_SRC but they also define special dependencies and compile rules
include $(TOOLSDIR)/tools.make
-include $(FIRMDIR)/firmware.make
-include $(ROOTDIR)/apps/bitmaps/bitmaps.make
+
+ifeq (,$(findstring checkwps,$(APPSDIR)))
+ include $(FIRMDIR)/firmware.make
+ include $(ROOTDIR)/apps/bitmaps/bitmaps.make
+endif
ifneq (,$(findstring bootloader,$(APPSDIR)))
include $(APPSDIR)/bootloader.make