From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 29 Aug 2008 12:59:27 +0000 (+0200)
Subject: Move gnutls_openpgp.c to lib/openpgp/.
X-Git-Tag: gnutls_2_5_6~45^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c56f580f17d3660e4f2ffedce5cf9532ea80a73d;p=thirdparty%2Fgnutls.git

Move gnutls_openpgp.c to lib/openpgp/.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 87eae1a54a..1c243914ac 100644
--- 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 6411b8ca51..cc2f798af4 100644
--- 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 cf3adb0c7e..23659c7722 100644
--- 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>