cached bulids were being reused

Makefile

@@ -2,27 +2,31 @@ DEVICE=/dev/ttyACM0
 
 all: firmwares
 
-firmwares: build/MockBand.guitar-wammy.hex
-build/MockBand.guitar-wammy.hex: VID=0x1bad
-build/MockBand.guitar-wammy.hex: PID=0x0004
-build/MockBand.guitar-wammy.hex: FLAGS=-DWAMMY
+firmwares: MockBand.guitar-wammy.hex
+MockBand.guitar-wammy.hex: VID=0x1bad
+MockBand.guitar-wammy.hex: PID=0x0004
+MockBand.guitar-wammy.hex: FLAGS=-DWAMMY
 
-firmwares: build/MockBand.guitar.hex
-build/MockBand.guitar.hex: VID=0x1bad
-build/MockBand.guitar.hex: PID=0x0004
+firmwares: MockBand.guitar.hex
+MockBand.guitar.hex: VID=0x1bad
+MockBand.guitar.hex: PID=0x0004
 
-firmwares: build/MockBand.drums.hex
-build/MockBand.drums.hex: VID=0x1bad
-build/MockBand.drums.hex: PID=0x3110
+firmwares: MockBand.drums.hex
+MockBand.drums.hex: VID=0x1bad
+MockBand.drums.hex: PID=0x3110
 
-firmwares: build/MockBand.drums1.hex
-build/MockBand.drums1.hex: VID=0x1bad
-build/MockBand.drums1.hex: PID=00005
+firmwares: MockBand.drumsx.hex
+MockBand.drumsx.hex: VID=0x1bad
+MockBand.drumsx.hex: PID=0x0003
+
+firmwares: MockBand.drums1.hex
+MockBand.drums1.hex: VID=0x1bad
+MockBand.drums1.hex: PID=00005
 
 
-build/MockBand.%.hex: MockBand.ino
+MockBand.%.hex: MockBand.ino
+	rm -rf build
 	mkdir -p build/cache
-	rm -f build/build.options.json
 	arduino-builder \
 		-build-path $(abspath build/) \
 		-build-cache $(abspath build/cache/) \
@@ -34,16 +38,16 @@ build/MockBand.%.hex: MockBand.ino
 	mv build/MockBand.ino.hex $@
 
 
-flash-%: build/MockBand.%.hex
+flash-%: MockBand.%.hex
 	echo -n "Waiting for $(DEVICE)..."; while [ ! -e $(DEVICE) ]; do echo -n .; sleep 1; done
 	avrdude -v -patmega32u4 -cavr109 -P$(DEVICE) -b57600 -D -Uflash:w:$<:i
 
-dist: build/MockBand.zip
+dist: MockBand.zip
 
 build/MockBand.zip: firmwares
 	rm -f $@
-	zip -r $@ README.md build/*.hex docs/
+	zip -r $@ README.md *.hex docs/
 
 clean:
-	rm -rf build
+	rm -rf build MockBand.*.hex MockBand.zip