From 8e55d0cca00ffcd139cb1f444cb2148e047f5289 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 22 Sep 2004 21:40:45 +0000 Subject: adjusted to work better in the new concept git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5108 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/Makefile | 17 +++++++++-------- apps/plugins/lib/Makefile | 2 -- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 6eb51df..caa2775 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 8b2eccf..2cc7974 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile @@ -47,5 +47,3 @@ clean: @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) -include $(DEPFILE) - - -- cgit v1.1