Several fixes for the broken rebase.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 22fae3f6be37ed9cd6d1c9c1dfb26e71211d6685..111ba4baf19703b4d69fe01fb9ff961223612132 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -84,11 +84,6 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c \
        ext_safe_renegotiation.c gnutls_mbuffers.c gnutls_privkey.c pkcs11.c \
        pkcs11_privkey.c gnutls_pubkey.c pkcs11_write.c
 
-if ENABLE_PKCS11
-COBJECTS += pkcs11.c pkcs11_privkey.c
-endif
-
-
 if ENABLE_NETTLE
 SUBDIRS += nettle
 else