Move gnutls_openpgp.c to lib/openpgp/.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 87eae1a54a2e09014096762700fcb39cc20bea04..1c243914acfc1d9eaead1c0a265f12b3ceb4c08d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -123,7 +123,6 @@ libgnutls_la_LIBADD += -lws2_32
 endif
 
 if ENABLE_OPENPGP
-libgnutls_la_SOURCES += gnutls_openpgp.c
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la
 libgnutls_la_LIBADD += opencdk/libminiopencdk.la
 endif

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 6411b8ca513318e235dbd1052dc40138a191c4f8..cc2f798af4a2c033d1279c169b91818f25bfe88f 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -32,7 +32,8 @@ endif
 
 noinst_LTLIBRARIES = libgnutls_openpgp.la
 
-COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c
+COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c      \
+       gnutls_openpgp.c
 
 libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h
 

diff --git a/lib/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
similarity index 99%
rename from lib/gnutls_openpgp.c
rename to lib/openpgp/gnutls_openpgp.c
index cf3adb0c7ee7337cef0867c3b7fbb6900d8ea005..23659c77224bcacf6596735542ce3f9237c467d1 100644 (file)
--- a/lib/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -29,7 +29,7 @@
 #include "gnutls_cert.h"
 #include "gnutls_datum.h"
 #include "gnutls_global.h"
-#include "openpgp/gnutls_openpgp.h"
+#include "gnutls_openpgp.h"
 #include "read-file.h"
 #include <gnutls_str.h>
 #include <gnutls_sig.h>