projects
/
slipway.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[slipway.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
270b0ec
..
9b3913f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,7
+16,7
@@
build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
mkdir -p src/com/ftdi/usb
swig -module FtdiUartNative -noproxy -package com.ftdi.usb -o $@ -outdir `dirname $@` -java $<
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 \
$< \
gcc -I. -Iupstream/libftdi -Iupstream/usb \
-I$(JAVA_HOME)/include \
$< \
@@
-42,7
+42,7
@@
upstream/libusb:
upstream/libusb/.built: upstream/libusb
cd upstream/libusb; \
upstream/libusb/.built: upstream/libusb
cd upstream/libusb; \
- ./configure &&
+ ./configure && \
make
touch $@
make
touch $@