diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-05-09 12:17:24 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-05-09 12:17:24 +0000 |
commit | a462b0caa39cf6464108c8269f4c5fc76fde1756 (patch) | |
tree | b7de53cc3013335c7d6051c1e039b84660c95a57 | |
parent | 714144bf542dd43683c0560d32292a1f1506b357 (diff) | |
download | rockbox-a462b0caa39cf6464108c8269f4c5fc76fde1756.tar.gz rockbox-a462b0caa39cf6464108c8269f4c5fc76fde1756.zip |
rebuild the ELF files if the rockbox lib was updated
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6449 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/Makefile b/apps/Makefile index b8db408a7e..ca2b427155 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -42,6 +42,8 @@ LINKROM = $(OBJDIR)/linkrom.lds | |||
42 | MAXINFILE = $(OBJDIR)/romstart.temp | 42 | MAXINFILE = $(OBJDIR)/romstart.temp |
43 | MAXOUTFILE = $(OBJDIR)/romstart | 43 | MAXOUTFILE = $(OBJDIR)/romstart |
44 | 44 | ||
45 | LIBROCKBOX = $(BUILDDIR)/librockbox.a | ||
46 | |||
45 | ifdef SIMVER | 47 | ifdef SIMVER |
46 | # this is a sim build | 48 | # this is a sim build |
47 | COMMONLIB = $(BUILDDIR)/comsim/libcomsim.a | 49 | COMMONLIB = $(BUILDDIR)/comsim/libcomsim.a |
@@ -79,13 +81,13 @@ $(MAXOUTFILE): | |||
79 | @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) | 81 | @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) |
80 | @rm $(MAXINFILE) | 82 | @rm $(MAXINFILE) |
81 | 83 | ||
82 | $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) | 84 | $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) |
83 | @echo "LD rombox.elf" | 85 | @echo "LD rombox.elf" |
84 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map | 86 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map |
85 | 87 | ||
86 | ifndef SIMVER | 88 | ifndef SIMVER |
87 | 89 | ||
88 | $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) | 90 | $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) |
89 | @echo "LD rockbox.elf" | 91 | @echo "LD rockbox.elf" |
90 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map | 92 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map |
91 | 93 | ||