Use convenience libraries for openpgp/ and opencdk/.

3 files changed, 49 insertions, 36 deletions

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 7a85d67d3d..e6d3968783 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,6 +1,25 @@
-DIST_SUBDIRS = openpgp opencdk
+AM_CPPFLAGS = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl			\
+	-I$(top_srcdir)/lib -I../includes -I$(top_srcdir)/includes	\
+	-I$(top_srcdir)/lib/minitasn1 -I$(srcdir)/openpgp		\
+	$(LIBGCRYPT_CFLAGS)
 
-INCLUDES = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl -I$(top_srcdir)/lib -I../includes -I$(top_srcdir)/includes -I$(top_srcdir)/lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -I$(srcdir)/opencdk -I$(srcdir)/openpgp
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
+else
+AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
+endif
+
+SUBDIRS = 
+
+if ENABLE_OPENPGP
+if ENABLE_INCLUDED_OPENCDK
+SUBDIRS += opencdk
+AM_CPPFLAGS += -I$(srcdir)/opencdk
+else
+AM_CPPFLAGS += $(LIBOPENCDK_CFLAGS)
+endif
+SUBDIRS += openpgp
+endif
 
 bin_SCRIPTS = libgnutls-extra-config
 
@@ -18,16 +37,17 @@ lib_LTLIBRARIES = libgnutls-extra.la
 
 # OpenSSL
 
+libgnutls_openssl_la_LDFLAGS =
 if ENABLE_OPENSSL
 lib_LTLIBRARIES += libgnutls-openssl.la
 
-libgnutls_openssl_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
 libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h	\
 	openssl_compat.c
 
 libgnutls_openssl_la_LIBADD = ../lib/libgnutls.la ../crypto/libgc.la
 
+libgnutls_openssl_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
 if ENABLE_MINITASN1
 libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la
 else
@@ -37,27 +57,14 @@ endif
 
 # OpenPGP
 
+libgnutls_extra_la_LIBADD =
+libgnutls_extra_la_LDFLAGS =
 if ENABLE_OPENPGP
-PGP_COBJECTS = gnutls_openpgp.c openpgp/xml.c \
-	openpgp/pgpverify.c openpgp/pgp.c \
-	openpgp/extras.c openpgp/compat.c openpgp/privkey.c
-
 if ENABLE_INCLUDED_OPENCDK
-SUBDIRS = openpgp opencdk
-
-OPENCDK_COBJECTS = opencdk/new-packet.c opencdk/read-packet.c opencdk/write-packet.c \
-	opencdk/main.c 	opencdk/verify.c opencdk/armor.c \
-	opencdk/sig-check.c opencdk/sign.c opencdk/keydb.c \
-        opencdk/keylist.c opencdk/seskey.c opencdk/pubkey.c opencdk/misc.c \
-	opencdk/encrypt.c opencdk/trustdb.c opencdk/kbnode.c \
-	opencdk/compress.c opencdk/plaintext.c opencdk/cipher.c \
-	opencdk/sym-cipher.c opencdk/stream.c opencdk/keyserver.c \
-	opencdk/keygen.c opencdk/md.c
+libgnutls_extra_la_LIBADD += opencdk/libminiopencdk.la
 else
-SUBDIRS = openpgp
-OPENCDK_COBJECTS = 
+libgnutls_extra_la_LDFLAGS += $(LIBOPENCDK_LIBS) 
 endif
-
 endif
 
 # LZO
@@ -69,14 +76,14 @@ endif
 
 COBJECTS_EXTRA = gnutls_extra.c
 
-libgnutls_extra_la_LDFLAGS = -export-symbols-regex '^gnutls.*' \
+libgnutls_extra_la_LDFLAGS += -export-symbols-regex '^gnutls.*' \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	$(LIBOPENCDK_LIBS) $(LZO_LIBS)
 
 libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS) \
 	$(PGP_COBJECTS) $(OPENCDK_COBJECTS) gnutls_extra.h
 
-libgnutls_extra_la_LIBADD = ../lib/libgnutls.la ../gl/libgnu.la
+libgnutls_extra_la_LIBADD += ../lib/libgnutls.la ../gl/libgnu.la
 
 
 gnutls-extra-api.texi: $(COBJECTS_EXTRA)
diff --git a/libextra/opencdk/Makefile.am b/libextra/opencdk/Makefile.am
index 2638644edc..c89899bd70 100644
--- a/libextra/opencdk/Makefile.am
+++ b/libextra/opencdk/Makefile.am
@@ -1,11 +1,12 @@
-# source files added here must be added to ../Makefile.am
-# to be compiled.
+INCLUDES = -I$(top_srcdir)/lib -I../../gl
 
-EXTRA_DIST =  md.h packet.h opencdk.h context.h README \
-        main.h cipher.h stream.h types.h filters.h \
-        new-packet.c \
-        read-packet.c write-packet.c main.c \
-        verify.c armor.c sig-check.c sign.c keydb.c \
-        keylist.c seskey.c pubkey.c misc.c encrypt.c \
-        trustdb.c kbnode.c compress.c plaintext.c cipher.c \
-	sym-cipher.c stream.c keyserver.c keygen.c md.c
+noinst_LTLIBRARIES = libminiopencdk.la
+
+libminiopencdk_la_SOURCES = md.h packet.h opencdk.h context.h main.h	\
+        cipher.h stream.h types.h filters.h new-packet.c read-packet.c	\
+        write-packet.c main.c verify.c armor.c sig-check.c sign.c	\
+        keydb.c keylist.c seskey.c pubkey.c misc.c encrypt.c trustdb.c	\
+        kbnode.c compress.c plaintext.c cipher.c sym-cipher.c stream.c	\
+        keyserver.c keygen.c md.c
+
+EXTRA_DIST = README
diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index e2ea3c566d..10b069bb6f 100644
--- a/libextra/openpgp/Makefile.am
+++ b/libextra/openpgp/Makefile.am
@@ -1,9 +1,14 @@
-# source files added here must be added to ../Makefile.am
-# to be compiled.
+AM_CPPFLAGS = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl		\
+	-I$(top_srcdir)/lib -I$(top_srcdir)/includes -I../includes	\
+	-I$(top_srcdir)/libextra/opencdk
+
+noinst_LTLIBRARIES = libgnutls_openpgp.la
 
 COBJECTS = pgp.c xml.c pgpverify.c extras.c compat.c privkey.c
 
-EXTRA_DIST = openpgp.h gnutls_openpgp.h $(COBJECTS) pgp-api.texi
+libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp.h gnutls_openpgp.h
+
+EXTRA_DIST = pgp-api.texi
 
 pgp-api.texi: $(COBJECTS)
 	@echo "" > pgp-api.texi