diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-09-22 21:40:45 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-09-22 21:40:45 +0000 |
| commit | 8e55d0cca00ffcd139cb1f444cb2148e047f5289 (patch) | |
| tree | fefe1857c5f379aa38780cdbb2f82467dfe06bdb /apps | |
| parent | c2e887c5f740aa32acaa2524a940de4413e71282 (diff) | |
adjusted to work better in the new concept
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5108 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 6 | ||||
| -rw-r--r-- | apps/plugins/Makefile | 17 | ||||
| -rw-r--r-- | apps/plugins/lib/Makefile | 2 |
3 files changed, 12 insertions, 13 deletions
diff --git a/apps/Makefile b/apps/Makefile index e140172607..912b5ed143 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -70,11 +70,11 @@ $(MAXOUTFILE): @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) @rm $(MAXINFILE) -$(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(OBJDIR)/librockbox.a +$(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(OBJDIR)/librockbox.a $(DEPFILE) @echo "LD rombox.elf" @$(CC) -Os -nostdlib -o $@ $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMDIR) -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map -$(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/librockbox.a +$(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/librockbox.a $(DEPFILE) @echo "LD rockbox.elf" @$(CC) -Os -nostdlib -o $@ $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMDIR) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map @@ -89,7 +89,7 @@ $(OBJDIR)/rombox.bin : $(OBJDIR)/rombox.elf $(OBJDIR)/rockbox.asm: $(OBJDIR)/rockbox.bin $(TOOLSDIR)/sh2d -sh1 $< > $@ -$(OBJDIR)/$(BINARY) : $(OBJDIR)/rockbox.bin $(DEPFILE) +$(OBJDIR)/$(BINARY) : $(OBJDIR)/rockbox.bin @echo "Build firmware file" @$(MKFIRMWARE) $< $@ diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 6eb51df5d3..caa2775e12 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -27,6 +27,13 @@ ELFS := $(SRC:%.c=$(OBJDIR)/%.elf) OBJS := $(SRC:%.c=$(OBJDIR)/%.o) DIRS = . +ifdef ENABLEDPLUGINS +all: $(OBJDIR)/libplugin.a $(ROCKS) $(DEPFILE) +else +all: + @echo "no plugin support yet" +endif + $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(OBJDIR)/libplugin.a $(DEPFILE) @echo "LD $@" @$(CC) -O -nostdlib -o $@ $< -L$(OBJDIR) -lplugin -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/$*.map @@ -37,14 +44,6 @@ $(OBJDIR)/%.rock : $(OBJDIR)/%.elf include $(TOOLSDIR)/make.inc -ifeq ($(ANYONDIO), ONDIO) -all: - @echo "no plugin support yet" -else -all: $(OBJDIR)/libplugin.a $(ROCKS) - @echo "plugins done" -endif - $(OBJDIR)/libplugin.a: @echo "MAKE in lib" @$(MAKE) -C lib TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} @@ -59,3 +58,5 @@ clean: @echo "cleaning plugins" @rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) $(OBJS) @$(MAKE) -C lib clean + +-include $(DEPFILE) diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index 8b2eccfb50..2cc7974770 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile @@ -47,5 +47,3 @@ clean: @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) -include $(DEPFILE) - - |