X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a210e01ca86cc5aaf74ef1cc498ac36f931b1ae7;hb=0382141d6a66f9f6da53d020413325c146f09d11;hp=270b0ecd70ae36640ee28bc1aeee1da6f2d809ff;hpb=cadac01133f837417e095159308867aeb166cc86;p=slipway.git

diff --git a/Makefile b/Makefile
index 270b0ec..a210e01 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,14 @@ endif
 ## slipway ############################################################################
 
 run: slipway.jar 
-	java -cp slipway.jar edu.berkeley.obits.AtmelSerial < bitstreams/led0.md4
+	java -cp slipway.jar edu.berkeley.slipway.Demo 30
 
 build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
 	mkdir -p `dirname $@`
 	mkdir -p src/com/ftdi/usb
 	swig -module FtdiUartNative -noproxy -package com.ftdi.usb -o $@ -outdir `dirname $@` -java $<
 
-build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c
+build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c upstream/libusb/.built
 	gcc -I. -Iupstream/libftdi -Iupstream/usb \
 		-I$(JAVA_HOME)/include \
 		$< \
@@ -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 $@