Index: proxy/buildall.sh
===================================================================
--- proxy/buildall.sh	(revision 72)
+++ proxy/buildall.sh	(working copy)
@@ -2,7 +2,6 @@
 cat targets.txt | (
     while read target model
     do
-        rm -f checkwps.$model
-        make MODEL=$model TARGET=$target checkwps.$model
+        make MODEL=$model TARGET=$target build
     done
 )
Index: proxy/cleanall.sh
===================================================================
--- proxy/cleanall.sh	(revision 72)
+++ proxy/cleanall.sh	(working copy)
@@ -2,6 +2,6 @@
 cat targets.txt | (
     while read target model
     do
-        rm -f checkwps.$model
+        make MODEL=$model TARGET=$target clean
     done
 )
Index: proxy/src/dummies.c
===================================================================
--- proxy/src/dummies.c	(revision 72)
+++ proxy/src/dummies.c	(working copy)
@@ -15,6 +15,9 @@
 int battery_percent = 100;
 
 charger_input_state_type charger_input_state;
+#if CONFIG_CHARGING >= CHARGING_MONITOR
+charge_state_type charge_state;
+#endif
 
 #if defined(CPU_PP) && defined(BOOTLOADER)
 /* We don't enable interrupts in the iPod bootloader, so we need to fake
Index: proxy/Makefile
===================================================================
--- proxy/Makefile	(revision 72)
+++ proxy/Makefile	(working copy)
@@ -14,13 +14,15 @@
 ifeq ($(findstring MINGW,$(shell uname)),MINGW)
 OS = w32
 CC = mingw32-gcc
-COPY = cp
+COPY = copy
+RM = rm
 endif
 
 ifeq ($(findstring Linux,$(shell uname)),Linux)
 OS = linux
 CC = gcc
 COPY = cp
+RM = rm -f
 endif
 
 
@@ -63,23 +65,35 @@
 
 CFLAGS = -g -D__PCTOOL__ -D__QDEBUG__ -DQT_READBMP -DDEBUG -DROCKBOX_DIR_LEN=1 -DBUTTON_REMOTE
 
-all: src/proxy.c  $(COMMON)
-	@echo CC [IRIVER_H10_5GB]
-	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON) src/proxy.c -o proxy.exe
-debug: src/proxy.c  $(COMMON)
-	@echo CC [IRIVER_H10_5GB]
-	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON)  src/proxy.c -o bin/debug/proxy.exe
+all:
+	@echo To build, run the buildall.sh script
+
+build: build-$(OS)
+
+build-w32: src/proxy.c  $(COMMON)
+	@echo CC [$(TARGET)]
+	@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) -DTARGET_MODEL=\"$(MODEL)\" -DBUILD_DLL $(COMMON) -shared src/proxy.c -o proxy_$(MODEL).dll
+
+build-linux: src/proxy.c  $(COMMON)
+	@echo CC [$(TARGET)]
+	@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) -DTARGET_MODEL=\"$(MODEL)\" $(COMMON) src/proxy.c -fPIC -o proxy_$(MODEL).o -Wl,"-soname libproxy_$(MODEL).so.1,-olibproxy_$(MODEL).so.1"
+
+clean: clean-$(OS)
+
+clean-w32:
+	$(RM) "proxy_$(MODEL).dll"
+
+clean-linux:
+	$(RM) "libproxy_$(MODEL).so.1"
+
 shared: shared-$(OS)
 
 shared-w32: src/proxy.c  $(COMMON)
 	@echo CC [IRIVER_H10_5GB]
-	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" -DBUILD_DLL $(COMMON)  -shared src/proxy.c -o ../gui/bin/proxy.dll
+	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" -DBUILD_DLL $(COMMON) -shared src/proxy.c -o ../gui/bin/proxy.dll
 #	@$(COPY) bin/debug/proxy.dll ../gui/bin/proxy.dll
 
 shared-linux: src/proxy.c $(COMMON)
 	@echo CC [IRIVER_H10_5GB]
-	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON)  src/proxy.c  -fPIC -o proxy.o -Wl,"-soname libproxy.so.1,-olibproxy.so.1"
+	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON) src/proxy.c -fPIC -o proxy.o -Wl,"-soname libproxy.so.1,-olibproxy.so.1"
 	@$(COPY) libproxy.so.1 ../gui/bin/libproxy.so.1
-
-clean:
-	rm -f checkwps.$(MODEL)