diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-07-24 09:42:59 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-07-24 09:42:59 +0000 |
| commit | 9b1b610bd012d2fc8b38b70953c273bed7ec221f (patch) | |
| tree | af34df0f8981d5df4418ae831ec2aeef35f0a6fa | |
| parent | 611e3592c71688e25c658b5178810bc6b0badb37 (diff) | |
| download | rockbox-9b1b610bd012d2fc8b38b70953c273bed7ec221f.tar.gz rockbox-9b1b610bd012d2fc8b38b70953c273bed7ec221f.zip | |
Henrik Backe's patch that makes the .map files get created in the build
directory and not in the source directory.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3872 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/Makefile | 4 | ||||
| -rw-r--r-- | apps/plugins/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index 55ef599d4f..b54c31cc4a 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
| @@ -116,9 +116,9 @@ $(OBJDIR)/lang.o: $(OBJDIR)/build.lang $(TOOLSDIR)/genlang | |||
| 116 | 116 | ||
| 117 | clean: | 117 | clean: |
| 118 | -rm -f $(OBJS) $(OBJDIR)/$(OUTNAME) $(OBJDIR)/rockbox.asm \ | 118 | -rm -f $(OBJS) $(OBJDIR)/$(OUTNAME) $(OBJDIR)/rockbox.asm \ |
| 119 | $(OBJDIR)/rockbox.bin $(OBJDIR)/rockbox.elf $(OBJDIR)/rockbox.map \ | 119 | $(OBJDIR)/rockbox.bin $(OBJDIR)/rockbox.elf $(OBJDIR)/*.map \ |
| 120 | $(OBJDIR)/lang.o $(OBJDIR)/build.lang $(OBJDIR)/lang.[ch] \ | 120 | $(OBJDIR)/lang.o $(OBJDIR)/build.lang $(OBJDIR)/lang.[ch] \ |
| 121 | $(OBJDIR)/credits.raw $(LINKFILE) | 121 | $(OBJDIR)/credits.raw $(LINKFILE) $(OBJDIR)/rockbox.ucl |
| 122 | -$(RM) -r $(OBJDIR)/$(DEPS) | 122 | -$(RM) -r $(OBJDIR)/$(DEPS) |
| 123 | $(MAKE) -C plugins clean | 123 | $(MAKE) -C plugins clean |
| 124 | 124 | ||
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index c0b5f14687..558afacc10 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
| @@ -31,7 +31,7 @@ no_configure: | |||
| 31 | endif | 31 | endif |
| 32 | 32 | ||
| 33 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) | 33 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) |
| 34 | $(CC) -O -nostdlib -o $@ $< -lgcc -T$(LINKFILE) -Wl,-Map,$*.map | 34 | $(CC) -O -nostdlib -o $@ $< -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/$*.map |
| 35 | 35 | ||
| 36 | $(OBJDIR)/%.rock : $(OBJDIR)/%.elf | 36 | $(OBJDIR)/%.rock : $(OBJDIR)/%.elf |
| 37 | $(OC) -O binary $< $@ | 37 | $(OC) -O binary $< $@ |