summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2004-07-27 10:24:28 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2004-07-27 10:24:28 +0000
commit5092c24bcab25097576429694da80f3fbf539585 (patch)
tree57897e9b42db986bfb357601ebdbcd71283dde5e
parentec7d1f4632a402230fdd5c61b8b3361e0c1d1e94 (diff)
downloadgnutls-5092c24bcab25097576429694da80f3fbf539585.tar.gz
*** empty log message ***
-rw-r--r--NEWS1
-rw-r--r--lib/Makefile.am2
-rw-r--r--libextra/gnutls_openpgp.c1
-rw-r--r--libextra/openpgp/extras.c1
-rw-r--r--libextra/openpgp/pgp.c1
-rw-r--r--libextra/openpgp/privkey.c1
-rw-r--r--libextra/openpgp/xml.c1
7 files changed, 2 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 961879eab6..90e28bd138 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Version 1.1.12
- Updated the SRP authentication to conform to the
latest (yet unreleased) draft. Unfortunately this breaks
compatibility with previous versions.
+- Changed the makefiles to be more portable.
Version 1.1.11 (16/07/2004)
- Added the '_t' suffix to all exported symbols.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 962b0ee7bd..f4dbe60d71 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../libextra -Iminitasn1/ -Ix509/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I../libextra -Iminitasn1/ -I../libextra/openpgp/ -I../libextra/opencdk -Ix509/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
bin_SCRIPTS = libgnutls-config
m4datadir = $(datadir)/aclocal
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index b8355adf3f..fe30c8cfd7 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -30,7 +30,6 @@
#include <gnutls_str.h>
#include <stdio.h>
#include <gcrypt.h>
-#include <opencdk.h>
#include <time.h>
#include <sys/stat.h>
diff --git a/libextra/openpgp/extras.c b/libextra/openpgp/extras.c
index 19e3a27376..5f523ed454 100644
--- a/libextra/openpgp/extras.c
+++ b/libextra/openpgp/extras.c
@@ -27,7 +27,6 @@
#include <gnutls_datum.h>
#include <gnutls_global.h>
#include <gnutls_errors.h>
-#include <opencdk.h>
#include <gnutls_openpgp.h>
#include <openpgp.h>
diff --git a/libextra/openpgp/pgp.c b/libextra/openpgp/pgp.c
index 6a169fec81..9726f8a707 100644
--- a/libextra/openpgp/pgp.c
+++ b/libextra/openpgp/pgp.c
@@ -27,7 +27,6 @@
#include <gnutls_datum.h>
#include <gnutls_global.h>
#include <gnutls_errors.h>
-#include <opencdk.h>
#include <openpgp.h>
#include <x509/rfc2818.h>
diff --git a/libextra/openpgp/privkey.c b/libextra/openpgp/privkey.c
index 8c59097e0b..2fd7e8609d 100644
--- a/libextra/openpgp/privkey.c
+++ b/libextra/openpgp/privkey.c
@@ -26,7 +26,6 @@
#include <gnutls_datum.h>
#include <gnutls_global.h>
#include <gnutls_errors.h>
-#include <opencdk.h>
#include <openpgp.h>
#include <gnutls_openpgp.h>
#include <x509/rfc2818.h>
diff --git a/libextra/openpgp/xml.c b/libextra/openpgp/xml.c
index 2f5dbe72d5..dfb2d1788d 100644
--- a/libextra/openpgp/xml.c
+++ b/libextra/openpgp/xml.c
@@ -23,7 +23,6 @@
#include <gnutls_int.h>
#include <gnutls_str.h>
#include <gnutls_errors.h>
-#include <opencdk.h>
#include <openpgp.h>
#include <x509/rfc2818.h> /* for MAX_CN */