diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-11-21 22:00:35 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-11-21 22:00:35 +0000 |
| commit | 5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37 (patch) | |
| tree | 17e890d241a584a9725a25e496ce4cf48f5d7df0 /apps/plugins/zxbox | |
| parent | fea18742a2911c5882f7f98c58be146cc631b68c (diff) | |
| download | rockbox-5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37.zip rockbox-5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37.tar.gz rockbox-5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37.tar.bz2 rockbox-5e4a6824bb0ad1829a51e3b2a71a1d1d748eca37.tar.xz | |
$* 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/zxbox')
| -rw-r--r-- | apps/plugins/zxbox/zxbox.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make index e617ba3..937bcde 100644 --- a/apps/plugins/zxbox/zxbox.make +++ b/apps/plugins/zxbox/zxbox.make @@ -36,7 +36,7 @@ ifdef SIMVER ZXBOX_LDFLAGS = $(SHARED_FLAG) # <-- from Makefile else ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.lds - ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/$*.map + ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map endif $(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ) @@ -45,11 +45,11 @@ $(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ) $(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(PLUGINLIB) - $(SILENT)$(CC) $(PLUGINFLAGS) -o $(ZXBOX_OBJDIR)/$*.elf \ + $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \ $(filter %.o, $^) \ $(filter %.a, $^) \ -lgcc $(ZXBOX_LDFLAGS) - $(call PRINTS,LD $(@F))$(OC) -O binary $(ZXBOX_OBJDIR)/$*.elf $@ + $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ # special pattern rule for compiling zxbox with extra flags $(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make |