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

git-svn-id: https://yubikey-personalization.googlecode.com/svn/trunk@70 b62f149e-849f-11dd-9899-c7ba65f7c4c7

diff --git a/Makefile.am b/Makefile.am
index c56cfaff87c45b88907e435d2e09871765134e75..f8845a83a0a33e9542a59f9261c26f3f56b7e7c8 100644 (file)
--- 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 38422a2b3e6c3e7c139fc65ea9481f6ca8da3989..9022d0c8ea4c68160c1f8ed696aac0fab15a4e9a 100644 (file)
--- 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