From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 17 Apr 2008 11:47:47 +0000 (+0200)
Subject: Simplify cdk handling.
X-Git-Tag: gnutls_2_3_6~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7819c8a1f4e41341a58a617d7a21f16cd2d7d58b;p=thirdparty%2Fgnutls.git

Simplify cdk handling.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 843358e7f0..3a5274fe76 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,13 +33,12 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"				\
 	-I$(top_srcdir)/includes -I../includes				\
 	-I$(srcdir)/x509						\
 	-I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/	\
-	-I$(top_srcdir)/lib/opencdk 				\
-	$(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
+	$(LIBGCRYPT_CFLAGS)
 
 if ENABLE_OPENPGP
 SUBDIRS += opencdk
-AM_CPPFLAGS += -I$(srcdir)/opencdk
 SUBDIRS += openpgp
+AM_CPPFLAGS += -I$(srcdir)/opencdk -I$(top_srcdir)/lib/opencdk
 endif
 
 if ENABLE_MINITASN1