From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 7 May 2009 18:25:31 +0000 (+0000)
Subject: Link to libusb properly, based on patch by Christer Kaivo-oja <christer.kaivooja... 
X-Git-Tag: yubikey-personalisation_1.3.5-1~4^2~162
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=137e1b497f0e44ab7b4226604e0303f2014e013f;p=yubikey-personalization.old

Link to libusb properly, based on patch by Christer Kaivo-oja <christer.kaivooja@gmail.com>.
---

diff --git a/Makefile.am b/Makefile.am
index c56cfaf..f8845a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ libykpers_la_SOURCES = ykpers.h ykpers.c ykpbkdf2.h ykpbkdf2.c
 libykpers_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h	\
 	rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c	\
 	rfc4634/sha-private.h
-libykpers_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la -lusb
+libykpers_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la
 libykpers_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/ykcore/Makefile.am b/ykcore/Makefile.am
index 38422a2..9022d0c 100644
--- a/ykcore/Makefile.am
+++ b/ykcore/Makefile.am
@@ -28,7 +28,7 @@
 noinst_LTLIBRARIES = libykcore.la
 libykcore_la_SOURCES = ykdef.h ykcore.h ykcore_backend.h ykcore.c \
 	ykstatus.h ykstatus.c
-libykcore_la_LIBADD = $(LTLIBYUBIKEY)
+libykcore_la_LIBADD = $(LTLIBYUBIKEY) $(LTLIBUSB)
 
 if BACKEND_LIBUSB
 libykcore_la_SOURCES += ykcore_libusb.c