adjusted to work better in the new concept

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5108 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 22 insertions, 14 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)
-
-
diff --git a/firmware/Makefile b/firmware/Makefile
index d21f85a622..bb4a30f101 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -35,7 +35,7 @@ $(TOOLSDIR)/convbdf:
 
 $(OUTPUT): $(OBJS) $(DEPFILE)
 	@echo "AR $@"
-	@$(AR) ruv $@ $+ >/dev/null 2>&1
+	@$(AR) ruv $@ $(OBJS) >/dev/null 2>&1
 
 include $(TOOLSDIR)/make.inc
 
diff --git a/tools/configure b/tools/configure
index 8118858d2f..37791bc6e4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -263,6 +263,7 @@ if [ -z "$archos" ]; then
     output="archos.mod"
     appextra="player"
     archosrom=""
+    plugins="yes"
     ;;
 
    3)
@@ -273,6 +274,7 @@ if [ -z "$archos" ]; then
     output="ajbrec.ajz"
     appextra="recorder"
     archosrom="$pwd/rombox.ucl"
+    plugins="yes"
     ;;
 
    4)
@@ -283,6 +285,7 @@ if [ -z "$archos" ]; then
     output="ajbrec.ajz"
     appextra="recorder"
     archosrom="$pwd/rombox.ucl"
+    plugins="yes"
     ;;
 
    7)
@@ -293,6 +296,7 @@ if [ -z "$archos" ]; then
     output="ajbrec.ajz"
     appextra="recorder"
     archosrom=""
+    plugins=""
     ;;
 
    8)
@@ -303,6 +307,7 @@ if [ -z "$archos" ]; then
     output="ajbrec.ajz"
     appextra="recorder"
     archosrom=""
+    plugins=""
     ;;
 
    9)
@@ -314,6 +319,7 @@ if [ -z "$archos" ]; then
     output="rockbox.iriver"
     appextra=""
     archosrom=""
+    plugins="yes"
     ;;
 
    *)
@@ -324,6 +330,7 @@ if [ -z "$archos" ]; then
     output="ajbrec.ajz"
     appextra="recorder"
     archosrom="$pwd/rombox.ucl"
+    plugins="yes"
     ;;
 
   esac
@@ -416,6 +423,7 @@ sed > Makefile \
  -e "s,@OUTPUT@,${output},g" \
  -e "s,@APPEXTRA@,${appextra},g" \
  -e "s,@ARCHOSROM@,${archosrom},g" \
+ -e "s,@PLUGINS@,${plugins},g" \
 <<EOF 
 ## Automaticly generated. http://rockbox.haxx.se
 
@@ -435,6 +443,7 @@ export VERSION=\$(shell date +%y%m%d-%H%M)
 export MKFIRMWARE=\$(TOOLSDIR)/@TOOL@
 export BINARY=@OUTPUT@
 export APPEXTRA=@APPEXTRA@
+export ENABLEDPLUGINS=@PLUGINS@
 export CC=@CC@
 export LD=@LD@
 export AR=@AR@