X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7eb0c165ab4e19c4aba8b1f45f77c78c3cf0dd07;hb=b89edf07b45b7821a31388f2467ad74d99870d60;hp=e048e3919d1e47e12f524ce0d8d49312051b64a4;hpb=30a843f9c15209b7b2b2518cd03f348fe41b39fe;p=slipway.git

diff --git a/Makefile b/Makefile
index e048e39..7eb0c16 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ endif
 ## slipway ############################################################################
 
 run: slipway.jar 
-	java -cp slipway.jar edu.berkeley.obits.AtmelSerial < bitstreams/led0.md4
+	java -cp slipway.jar edu.berkeley.slipway.Demo < bitstreams/led0.md4
 
 build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
 	mkdir -p `dirname $@`
@@ -42,7 +42,7 @@ upstream/libusb:
 
 upstream/libusb/.built: upstream/libusb
 	cd upstream/libusb; \
-		./configure &&
+		./configure && \
 		make
 	touch $@
 
@@ -52,7 +52,7 @@ upstream/libusb/.built: upstream/libusb
 
 ## for rebuilding usbdrone.hex ###########################################################
 
-build/slipway_drone.hex: src/edu/berkeley/slipway/slipway_drone.c  upstream/avr-libc/.built
+build/slipway_drone.hex: src/edu/berkeley/slipway/FtdiBoardSlave.c  upstream/avr-libc/.built
 	upstream/prefix/bin/avr-gcc -O3 -mmcu=at94k $< -o $@.o
 	upstream/prefix/bin/avr-objcopy -O ihex $@.o $@
 
@@ -65,6 +65,7 @@ bitstreams/slipway_drone.bst: build/slipway_drone.hex
 	rm /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
 	diff -u /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst $@ && exit -1; true
 	mv /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst $@
+	touch $@