From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 31 May 2012 07:49:52 +0000 (+0200)
Subject: Windows: Build fixes related to self checks.
X-Git-Tag: v1.7.0~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c9bee093db9155432b17abfbffa04a92d1518bd;p=yubikey-personalization

Windows: Build fixes related to self checks.
---

diff --git a/NEWS b/NEWS
index 1b0fdc0..79700a7 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
 
 * Version 1.6.5 (unreleased)
 
+** Windows: Build fixes related to self checks.
+
 * Version 1.6.4 (released 2012-05-24)
 
 ** Implement option -ooath-id to easily set OATH token identifier.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7d2780f..031df21 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,7 @@
 
 AM_LDFLAGS = -no-install
 AM_CFLAGS=-I$(srcdir)/.. -I$(srcdir)/../ykcore
-LDADD = ../libykpers-1.la
+LDADD = ../libykpers-1.la $(LTLIBYUBIKEY)
 
 ctests = selftest test_args_to_config test_key_generation
 check_PROGRAMS = $(ctests)
diff --git a/ykpers4win.mk b/ykpers4win.mk
index 13232e7..07dbb5d 100644
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-LIBYUBIKEYVERSION=1.8
+LIBYUBIKEYVERSION=1.7
 PROJECT=yubikey-personalization
 PACKAGE=ykpers
 
@@ -42,13 +42,6 @@ usage:
 		exit 1; \
 	fi
 
-
-#DLLS=$(HOME)/.wine/drive_c/windows/system32
-#.PHONY: hack-wine
-#hack-wine:
-#	test -L $(DLLS)/libyubikey-0.dll || \
-#		ln -sv $(PWD)/tmp/root/bin/libyubikey-0.dll $(DLLS)/
-
 ykpers4win:
 	rm -rf tmp && mkdir tmp && cd tmp && \
 	wget http://yubico-c.googlecode.com/files/libyubikey-$(LIBYUBIKEYVERSION).tar.gz && \