update links for Makefile

[slipway.git] / Makefile

diff --git a/Makefile b/Makefile
index 615e63b..19b1a52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,25 @@
 ifeq ($(shell uname),Darwin)
-linkerflags = -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation
+linkerflags = -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -dynamiclib -framework JavaVM
 jnilib      = libFtdiUartNative.jnilib
 else
 linkerflags =
 jnilib      = libFtdiUartNative.so
 endif
 
+libusb_url = 'http://downloads.sourceforge.net/project/libusb/libusb-0.1%20%28LEGACY%29/0.1.12/libusb-0.1.12.tar.gz?use_mirror=cdnetworks-us-1'
+edifparser_url = 'http://downloads.sourceforge.net/project/byuediftools/byuediftools/proton%20%280.5.2%29/byuediftools-0.5.2.jar?use_mirror=cdnetworks-us-2'
+
 ## demos ############################################################################
 
+asyncdemo: slipway.jar 
+       java -cp slipway.jar edu.berkeley.slipway.demos.FastestMicropipelineFifoDemo misc/data/async/
+
 demo: slipway.jar 
        java -cp slipway.jar edu.berkeley.slipway.demos.Demo 30
 
 demo2: slipway.jar 
        java -cp slipway.jar edu.berkeley.slipway.demos.Demo2 30
 
-asyncdemo: slipway.jar 
-       java -cp slipway.jar edu.berkeley.slipway.demos.FastestMicropipelineFifoDemo misc/data/async/
-
 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
@@ -36,9 +39,9 @@ build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c upstream/libusb/.built
                upstream/libftdi/ftdi.c \
                upstream/libusb/.libs/libusb.a \
                $(linkerflags) \
-               -o $@ -dynamiclib -framework JavaVM
+               -o $@
 
-slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slipway_drone.bst
+slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slipway_drone.bst upstream/jhdl-edifparser.jar
        mkdir -p build
        $(javac) -d build $(shell find src build/src -name \*.java)
        cp misc/slipway_drone.bst build/edu/berkeley/slipway/
@@ -50,7 +53,7 @@ slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slip
 
 upstream/libusb:
        mkdir -p `dirname $@`
-       cd upstream; curl http://voxel.dl.sourceforge.net/sourceforge/libusb/libusb-0.1.12.tar.gz | tar -xvzf -
+       cd upstream; curl -L ${libusb_url} | tar -xvzf -
        cd upstream; mv libusb-0.1.12 libusb
 
 upstream/libusb/.built: upstream/libusb
@@ -71,24 +74,24 @@ build/slipway_drone.hex: src/edu/berkeley/slipway/SlipwaySlave.c  upstream/avr-l
        upstream/prefix/bin/avr-objcopy -O ihex $@.o $@
 
 # this only works on my personal setup [adam]
-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...
-       read
-       rm /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
-       diff -u /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@ && \
-               exit -1; true
-       mv /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@
-       touch $@
+#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...
+#      read
+#      rm /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
+#      diff -u /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@ && \
+#              exit -1; true
+#      mv /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@
+#      touch $@
 
 
 
 ## avr-gcc toolchain and libc ################################################################
 
 upstream/binutils:
-       cd upstream; curl http://ftp.gnu.org/pub/pub/pub/gnu/binutils/binutils-2.16.1.tar.bz2 | tar -xvjf -
-       cd upstream; mv binutils-2.16.1 binutils
+       cd upstream; curl -L http://ftp.gnu.org/pub/pub/pub/gnu/binutils/binutils-2.19.1.tar.bz2 | tar -xvjf -
+       cd upstream; mv binutils-2.19.1 binutils
 
 upstream/binutils/.built: upstream/binutils
        mkdir -p upstream/prefix
@@ -100,7 +103,7 @@ upstream/binutils/.built: upstream/binutils
        touch $@
 
 upstream/gcc:
-       cd upstream; curl http://ftp.gnu.org/pub/gnu/gcc/gcc-4.0.3/gcc-core-4.0.3.tar.bz2 | tar -xvjf -
+       cd upstream; curl -L http://ftp.gnu.org/pub/gnu/gcc/gcc-4.0.3/gcc-core-4.0.3.tar.bz2 | tar -xvjf -
        cd upstream; mv gcc-4.0.3 gcc
 
 upstream/gcc/.built: upstream/gcc upstream/binutils/.built
@@ -114,7 +117,7 @@ upstream/gcc/.built: upstream/gcc upstream/binutils/.built
        touch $@
 
 upstream/avr-libc:
-       cd upstream; curl http://nongnu.askapache.com/avr-libc/avr-libc-1.4.3.tar.bz2 | tar -xvjf -
+       cd upstream; curl -L 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
@@ -130,7 +133,7 @@ upstream/avr-libc/.built: upstream/avr-libc upstream/gcc/.built
 
 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
+       curl -Lo $@- ${edifparser_url}
        mv $@- $@
 
 ## javadoc ##############################################################################