From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 3 Jun 2010 18:06:20 +0000 (+0200)
Subject: Several fixes for the broken rebase.
X-Git-Tag: gnutls_2_11_3~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e235bb89e1e1b03f1197805b9f2029b3473a7a0a;p=thirdparty%2Fgnutls.git

Several fixes for the broken rebase.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 22fae3f6be..111ba4baf1 100644
--- 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