Windows: Build fixes related to self checks.

diff --git a/NEWS b/NEWS
index 1b0fdc0db456419721d76c0754b3b9f30d11f06c..79700a75840b1dff1bdd477e1cfc35fb7ce37ca9 100644 (file)
--- 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 7d2780fecf75ed67eca31fd817570b0d04b5f613..031df21d5c091a1d736a4a4280be99812e404388 100644 (file)
--- 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 13232e7c900c147ab68f9d00986ca0b3e22a771e..07dbb5dbbd9a04f070af904eac2cc4977ec4134e 100644 (file)
--- 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 && \