X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8245190aaaee440df8052b6ca36479cdf6ab07d3;hb=7898ca4833e0bfc7744da1cb1b2d9d74ae368fbf;hp=dbb153c9702ad176cae08564a2d200d7cf8b0197;hpb=f6f476bd63c268a2dbcc09c85f79dbc807a74ba3;p=slipway.git

diff --git a/Makefile b/Makefile
index dbb153c..8245190 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
 	swig -module FtdiUartNative -noproxy -package com.ftdi.usb -o $@ -outdir `dirname $@` -java $<
 
 build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c upstream/libusb/.built
-	gcc -I. -Iupstream/libftdi -Iupstream/usb \
+	gcc -I. -Iupstream/libftdi -Iupstream/libusb \
 		-I$(JAVA_HOME)/include \
 		$< \
 		upstream/libftdi/ftdi.c \
@@ -40,7 +40,7 @@ slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slip
 
 upstream/libusb:
 	mkdir -p `dirname $@`
-	cd upstream; curl http://umn.dl.sourceforge.net/sourceforge/libusb/libusb-0.1.12.tar.gz | tar -xvzf -
+	cd upstream; curl http://voxel.dl.sourceforge.net/sourceforge/libusb/libusb-0.1.12.tar.gz | tar -xvzf -
 	cd upstream; mv libusb-0.1.12 libusb
 
 upstream/libusb/.built: upstream/libusb
@@ -104,7 +104,7 @@ upstream/gcc/.built: upstream/gcc upstream/binutils/.built
 	touch $@
 
 upstream/avr-libc:
-	cd upstream; curl http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.4.3.tar.bz2 | tar -xvjf -
+	cd upstream; curl http://nongnu.askapache.com/avr-libc/avr-libc-1.4.3.tar.bz2 | tar -xvjf -
 	cd upstream; mv avr-libc-1.4.3 avr-libc
 
 upstream/avr-libc/.built: upstream/avr-libc upstream/gcc/.built
@@ -117,7 +117,7 @@ upstream/avr-libc/.built: upstream/avr-libc upstream/gcc/.built
 
 mpardemo: upstream/jhdl-edifparser.jar slipway.jar
 	iverilog  -t fpga -s main -o out.edf misc/mpardemo.v
-	java -cp slipway.jar:upstream/jhdl-edifparser.jar MPARDemo out.edf
+	java -cp slipway.jar:upstream/jhdl-edifparser.jar edu.berkeley.slipway.mpar.MPARDemo out.edf
 
 
 ## edif parser ##########################################################################