Use native Windows backend by assuming 1.5.1 and drop libusb.

diff --git a/ykpers4win.mk b/ykpers4win.mk
index 06d8c038c959479e83aa0b44cba6216a255b3339..a9b6cb2e4beac429f41d11d048ce21058d88f7bc 100644 (file)
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -1,27 +1,25 @@
+LIBYUBIKEYVERSION=1.7
+YKPERSVERSION=1.5.1
+
 all: ykpers4win32 ykpers4win64
 
 ykpers4win:
        rm -rf tmp && mkdir tmp && cd tmp && \
-       wget http://yubico-c.googlecode.com/files/libyubikey-1.7.tar.gz && \
-       tar xfa libyubikey-1.7.tar.gz && \
-       cd libyubikey-1.7 && \
+       wget http://yubico-c.googlecode.com/files/libyubikey-$(LIBYUBIKEYVERSION).tar.gz && \
+       tar xfa libyubikey-$(LIBYUBIKEYVERSION).tar.gz && \
+       cd libyubikey-$(LIBYUBIKEYVERSION) && \
        ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
        make install $(CHECK) && \
        cd .. && \
-       wget http://yubikey-personalization.googlecode.com/files/libusb-1.0.8-windows.tar.bz2 && \
-       tar xfa libusb-1.0.8-windows.tar.bz2 && \
-       cd libusb-1.0.8 && \
-       ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
-       make install && \
-       cd .. && \
-       wget http://yubikey-personalization.googlecode.com/files/ykpers-1.4.0.tar.gz && \
-       tar xfa ykpers-1.4.0.tar.gz && \
-       cd ykpers-1.4.0/ && \
-       PKG_CONFIG_PATH=$(PWD)/tmp/root/lib/pkgconfig ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root CPPFLAGS=-I$(PWD)/tmp/root/include && \
+       cp ../ykpers-$(YKPERSVERSION).tar.gz . \
+               || wget http://yubikey-personalization.googlecode.com/files/ykpers-$(YKPERSVERSION).tar.gz && \
+       tar xfa ykpers-$(YKPERSVERSION).tar.gz && \
+       cd ykpers-$(YKPERSVERSION)/ && \
+       ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root LDFLAGS=-L$(PWD)/tmp/root/lib CPPFLAGS=-I$(PWD)/tmp/root/include && \
        make install $(CHECK) && \
        cd .. && \
        cd root && \
-       zip -r ../../ykpers-1.4.0-win$(ARCH).zip *
+       zip -r ../../ykpers-$(YKPERSVERSION)-win$(ARCH).zip *
 
 ykpers4win32:
        $(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i686-w64-mingw32 CHECK=