avoid using libtool's convenience libraries since they are buggy and cause conflicts in linking.

5 files changed, 29 insertions, 16 deletions

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 1a79df3d96..43786c9f86 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = -I../lib -I../includes -I../lib/minitasn1/ $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -Iopencdk/ -Iopenpgp/
+AM_CFLAGS = -DVERSION=\"gnutls/opencdk\"
 bin_SCRIPTS = libgnutls-extra-config
 DIST_SUBDIRS = openpgp opencdk
 
@@ -31,14 +32,24 @@ lib_LTLIBRARIES = libgnutls-extra.la
 endif
 
 if ENABLE_OPENPGP
-PGP_SOURCES = gnutls_openpgp.c
+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
-PGP_OBJECTS = openpgp/libpgp.la opencdk/libopencdk.la
+
+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
 else
 SUBDIRS = openpgp
-PGP_OBJECTS = openpgp/libpgp.la
+OPENCDK_COBJECTS = 
 endif
 
 endif
@@ -53,17 +64,17 @@ endif
 
 COBJECTS_EXTRA = ext_srp.c \
 	gnutls_srp.c auth_srp.c auth_srp_passwd.c auth_srp_sb64.c \
-	gnutls_extra.c auth_srp_rsa.c $(PGP_SOURCES)
+	gnutls_extra.c auth_srp_rsa.c
 
 
 libgnutls_extra_la_LDFLAGS = $(libgnutls_extra_version_script_cmd) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	$(LIBOPENCDK_LIBS) $(LZO_LIBS)
 
-libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS)
+libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS) \
+	$(PGP_COBJECTS) $(OPENCDK_COBJECTS)
 
-libgnutls_extra_la_LIBADD = $(PGP_OBJECTS) \
-	../lib/libgnutls.la
+libgnutls_extra_la_LIBADD = ../lib/libgnutls.la
 
 
 gnutls-extra-api.tex: $(COBJECTS_EXTRA)
diff --git a/libextra/opencdk/Makefile.am b/libextra/opencdk/Makefile.am
index 7366c719ed..2638644edc 100644
--- a/libextra/opencdk/Makefile.am
+++ b/libextra/opencdk/Makefile.am
@@ -1,11 +1,11 @@
-INCLUDES = -I../../ -DVERSION=\"gnutls/opencdk\"
+# source files added here must be added to ../Makefile.am
+# to be compiled.
+
 EXTRA_DIST =  md.h packet.h opencdk.h context.h README \
-        main.h cipher.h stream.h types.h filters.h
-noinst_LTLIBRARIES = libopencdk.la
-libopencdk_la_SOURCES = new-packet.c \
+        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
-
diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index 2cad57f39e..a5e40ce6dc 100644
--- a/libextra/openpgp/Makefile.am
+++ b/libextra/openpgp/Makefile.am
@@ -1,7 +1,9 @@
-INCLUDES = -I. -I../ -I../../includes/ -I../../lib -I../../lib/minitasn1 -I../opencdk $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS)
-EXTRA_DIST = openpgp.h gnutls_openpgp.h 
-noinst_LTLIBRARIES = libpgp.la
-libpgp_la_SOURCES = openpgp.c xml.c verify.c extras.c compat.c privkey.c
+# source files added here must be added to ../Makefile.am
+# to be compiled.
+
+COBJECTS = pgp.c xml.c pgpverify.c extras.c compat.c privkey.c
+
+EXTRA_DIST = openpgp.h gnutls_openpgp.h $(COBJECTS)
 
 pgp-api.tex: $(COBJECTS)
 	@echo "" > pgp-api.tex
diff --git a/libextra/openpgp/openpgp.c b/libextra/openpgp/pgp.c
index 6a169fec81..6a169fec81 100644
--- a/libextra/openpgp/openpgp.c
+++ b/libextra/openpgp/pgp.c
diff --git a/libextra/openpgp/verify.c b/libextra/openpgp/pgpverify.c
index b06eea419e..b06eea419e 100644
--- a/libextra/openpgp/verify.c
+++ b/libextra/openpgp/pgpverify.c