Simplify cdk handling.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 843358e7f0805b2696d78e48a1e13de7546c23c5..3a5274fe761c7ff8ae28619e77c359ecf9c3d07b 100644 (file)
--- 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