$* 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
This commit is contained in:
Jens Arnold 2008-11-21 22:00:35 +00:00
parent fea18742a2
commit 5e4a6824bb
3 changed files with 9 additions and 9 deletions

View file

@ -26,7 +26,7 @@ else
ROCKBOY_INLDS := $(APPSDIR)/plugins/plugin.lds
ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock
endif
ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(ROCKBOY_OBJDIR)/$*.map
ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.lds
else
### simulator
@ -46,8 +46,8 @@ $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ)
$(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB)
$(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB)
$(SILENT)$(CC) $(PLUGINFLAGS) -o $(ROCKBOY_OBJDIR)/$*.elf \
$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
$(filter %.o, $^) \
$(filter %.a, $^) \
-lgcc $(ROCKBOY_OVLFLAGS)
$(call PRINTS,LD $(@F))$(OC) -O binary $(ROCKBOY_OBJDIR)/$*.elf $@
$(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@