Index: apps/plugins/Makefile
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- apps/plugins/Makefile	28 Nov 2003 12:06:47 -0000	1.5
+++ apps/plugins/Makefile	18 May 2004 15:17:01 -0000
@@ -12,8 +12,10 @@
 
 FIRMWARE = ../../firmware
 
-INCLUDES = -I$(FIRMWARE)/include -I$(FIRMWARE)/export -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I..
-CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEM}
+INCLUDES = -I$(FIRMWARE)/include -I$(FIRMWARE)/export -I$(FIRMWARE)/common \
+-I$(FIRMWARE)/drivers -I.. -Ilib
+CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes	\
+$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEM}
 
 LDS := plugin.lds
 LINKFILE := $(OBJDIR)/pluginlink.lds
@@ -30,8 +32,8 @@
 	@echo "http://rockbox.haxx.se/docs/how_to_compile.html"
 endif
 
-$(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE)
-	$(CC) -O -nostdlib -o $@ $< -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/$*.map
+$(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(OBJDIR)/libplugin.a
+	$(CC) -O -nostdlib -o $@ $< -lgcc -L$(OBJDIR) -lplugin -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/$*.map
 
 $(OBJDIR)/%.rock : $(OBJDIR)/%.elf
 	$(OC) -O binary $< $@
@@ -40,7 +42,10 @@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 all: $(ROCKS)
-	@echo done
+	$(MAKE) -C lib TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEM}
+
+$(OBJDIR)/libplugin.a:
+	$(MAKE) -C lib TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEM}
 
 # MEM should be passed on to this makefile with the chosen memory size given
 # in number of MB