diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-07-31 22:09:07 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-07-31 22:09:07 +0000 |
| commit | fe95c863e0359bc1bcbde4872495f73fc62de20d (patch) | |
| tree | dc34e53c27ac0bed7a1484aedc159146b5610dcf /apps | |
| parent | a4aaa071767268a72b77eab1a61f0ae7fff0b85d (diff) | |
| download | rockbox-fe95c863e0359bc1bcbde4872495f73fc62de20d.zip rockbox-fe95c863e0359bc1bcbde4872495f73fc62de20d.tar.gz rockbox-fe95c863e0359bc1bcbde4872495f73fc62de20d.tar.bz2 rockbox-fe95c863e0359bc1bcbde4872495f73fc62de20d.tar.xz | |
corrected the 2uclpack mistake
and fixed up some targets to use the convenience macros more
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3907 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/Makefile b/apps/Makefile index e9667bb..2cbb42c 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -7,6 +7,9 @@ # $Id$ # +# $< is the name to the left of the colon +# $@ is the first name to the right of the colon + CC = sh-elf-gcc LD = sh-elf-ld AR = sh-elf-ar @@ -87,22 +90,22 @@ $(LINKFILE): $(LDS) cat $< | $(CC) -DMEMORYSIZE=$(MEM) $(DEFINES) -E -P - >$@ $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/librockbox.a - $(CC) -Os -nostdlib -o $(OBJDIR)/rockbox.elf $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMWARE) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map + $(CC) -Os -nostdlib -o $< $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMWARE) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf - $(OC) -O binary $(OBJDIR)/rockbox.elf $(OBJDIR)/rockbox.bin + $(OC) -O binary $@ $< $(OBJDIR)/rockbox.asm: $(OBJDIR)/rockbox.bin - $(TOOLSDIR)/sh2d -sh1 $(OBJDIR)/rockbox.bin > $(OBJDIR)/rockbox.asm + $(TOOLSDIR)/sh2d -sh1 $@ > $< $(OBJDIR)/$(OUTNAME) : $(OBJDIR)/rockbox.bin - $(TOOLSDIR)/scramble $(SCRAMBLE_OPT) $(OBJDIR)/rockbox.bin $(OBJDIR)/$(OUTNAME) + $(TOOLSDIR)/scramble $(SCRAMBLE_OPT) $@ $< $(OBJDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin - @a=`2uclpack -h 2>/dev/null`; \ + @a=`uclpack -h 2>/dev/null`; \ if test -n "$$a"; then \ echo "runs uclpack"; \ - uclpack --best --2e $(OBJDIR)/rockbox.bin $(OBJDIR)/rockbox.ucl >/dev/null 2>&1; \ + uclpack --best --2e $< $@ >/dev/null 2>&1; \ else \ echo "no uclpack command found, makes a fake UCL file"; \ echo "fake" > $@; \ |