cleanup

[slipway.git] / Makefile

diff --git a/Makefile b/Makefile
index e048e39..7eb0c16 100644 (file)
--- 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 $@