X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7b027e2e1f20e15796ee61648e4752a5e099c3a5;hb=8408f9d982c0c25fd1f6d63b97009bb1ce8fba60;hp=615e63bc4c09395804ec76d91db579cfd64537fa;hpb=5301afc9e47f0dd6f96858d1c70407e0df5b53cf;p=slipway.git

diff --git a/Makefile b/Makefile
index 615e63b..7b027e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 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 =
@@ -8,15 +8,15 @@ endif
 
 ## 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 +36,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/
@@ -71,24 +71,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 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