summaryrefslogtreecommitdiff
path: root/apps/plugins/rockboy
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-11-21 22:00:35 +0000
committerJens Arnold <amiconn@rockbox.org>2008-11-21 22:00:35 +0000
commit5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37 (patch)
tree17e890d241a584a9725a25e496ce4cf48f5d7df0 /apps/plugins/rockboy
parentfea18742a2911c5882f7f98c58be146cc631b68c (diff)
downloadrockbox-5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37.tar.gz
rockbox-5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37.zip
$* doesn't work if the target doesn't use a wildcard. Furthermore the GNU make manual discourages its use. Using works, and automatically ensures the correct directory. zxbox.map and chessbox.map were put into the wrong dir (build dir) and overwrote each other.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19176 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockboy')
-rw-r--r--apps/plugins/rockboy/rockboy.make6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make
index 62196cf0b7..7faf1a56e9 100644
--- a/apps/plugins/rockboy/rockboy.make
+++ b/apps/plugins/rockboy/rockboy.make
@@ -26,7 +26,7 @@ else
26 ROCKBOY_INLDS := $(APPSDIR)/plugins/plugin.lds 26 ROCKBOY_INLDS := $(APPSDIR)/plugins/plugin.lds
27 ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock 27 ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock
28endif 28endif
29 ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(ROCKBOY_OBJDIR)/$*.map 29 ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
30 ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.lds 30 ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.lds
31else 31else
32 ### simulator 32 ### simulator
@@ -46,8 +46,8 @@ $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ)
46$(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB) 46$(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB)
47 47
48$(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB) 48$(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB)
49 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(ROCKBOY_OBJDIR)/$*.elf \ 49 $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
50 $(filter %.o, $^) \ 50 $(filter %.o, $^) \
51 $(filter %.a, $^) \ 51 $(filter %.a, $^) \
52 -lgcc $(ROCKBOY_OVLFLAGS) 52 -lgcc $(ROCKBOY_OVLFLAGS)
53 $(call PRINTS,LD $(@F))$(OC) -O binary $(ROCKBOY_OBJDIR)/$*.elf $@ 53 $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@