update urls for upstream code

[slipway.git] / Makefile

diff --git a/Makefile b/Makefile
index 07d824e..8245190 100644 (file)
--- 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 \
@@ -28,10 +28,10 @@ build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c upstream/libusb/.built
                $(linkerflags) \
                -o $@ -dynamiclib -framework JavaVM
 
-slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) bitstreams/slipway_drone_complete.bst
+slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slipway_drone.bst
        mkdir -p build
-       javac -d build $(shell find src build/src -name \*.java)
-       cp bitstreams/slipway_drone_complete.bst build/edu/berkeley/slipway/
+       $(javac) -d build $(shell find src build/src -name \*.java)
+       cp misc/slipway_drone.bst build/edu/berkeley/slipway/
        cd build; jar cvf ../$@ .
 
 
@@ -40,7 +40,7 @@ slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) bitstream
 
 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
@@ -49,6 +49,7 @@ upstream/libusb/.built: upstream/libusb
                make
        touch $@
 
+javac = javac -cp upstream/jhdl-edifparser.jar
 #java = java -Djava.library.path=$(shell pwd)/lib/ -cp lib/RXTXcomm.jar:slipway.jar
 
 
@@ -60,7 +61,7 @@ build/slipway_drone.hex: src/edu/berkeley/slipway/FtdiBoardSlave.c  upstream/avr
        upstream/prefix/bin/avr-objcopy -O ihex $@.o $@
 
 # this only works on my personal setup [adam]
-bitstreams/slipway_drone_complete.bst: build/slipway_drone.hex
+misc/slipway_drone.bst: build/slipway_drone.hex
        cp $<    /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
        fs flush /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
        echo okay...
@@ -103,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
@@ -112,4 +113,33 @@ upstream/avr-libc/.built: upstream/avr-libc upstream/gcc/.built
                ./configure --prefix=$(shell pwd)/upstream/prefix --host=avr && \
                PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make && \
                PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make install
-       touch $@
\ No newline at end of file
+       touch $@
+
+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 edu.berkeley.slipway.mpar.MPARDemo out.edf
+
+
+## edif parser ##########################################################################
+
+upstream/jhdl-edifparser.jar:
+       mkdir -p upstream
+       curl -o $@- http://reliability.ee.byu.edu/edif/jars/release_0.3.0/edif-0.3.0.jar
+       mv $@- $@
+
+## javadoc ##############################################################################
+
+javadoc:
+       rm -rf doc/api
+       mkdir -p doc/api
+       javadoc \
+               -linksource \
+               -windowtitle "abits" \
+               -sourcepath src \
+               -public \
+               -notree \
+               -noindex \
+               -nonavbar \
+               -noqualifier all \
+               -d doc/api \
+               `find src -name \*.java`