From 5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 21 Nov 2008 22:00:35 +0000 Subject: $* 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 --- apps/plugins/rockboy/rockboy.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/plugins/rockboy') 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 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 $@ -- cgit v1.2.3