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

8 files changed, 54 insertions, 40 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5817151fd5..962b0ee7bd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I../libextra -Iminitasn1/ -Ix509/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
 bin_SCRIPTS = libgnutls-config
 
 m4datadir = $(datadir)/aclocal
@@ -13,10 +13,12 @@ endif
 DIST_SUBDIRS = minitasn1 x509
 if ENABLE_MINITASN1
 SUBDIRS = minitasn1 x509
-MINITASN1_OBJECTS = minitasn1/libminitasn1.la
+MINITASN1_COBJECTS = minitasn1/decoding.c minitasn1/gstr.c minitasn1/errors.c \
+	minitasn1/parser_aux.c minitasn1/structure.c minitasn1/element.c \
+	minitasn1/coding.c
 else
 SUBDIRS = x509
-MINITASN1_OBJECTS = 
+MINITASN1_COBJECTS = 
 endif
 
 EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \
@@ -36,6 +38,11 @@ EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \
 	ext_cert_type.h gnutls_rsa_export.h ext_server_name.h auth_dh_common.h
 lib_LTLIBRARIES = libgnutls.la
 
+X509_COBJECTS = x509/crl.c x509/dn.c x509/common.c x509/x509.c x509/extensions.c \
+	x509/dsa.c x509/rfc2818_hostname.c x509/verify.c x509/mpi.c \
+	x509/privkey.c x509/pkcs7.c x509/crq.c x509/xml.c x509/sign.c x509/pkcs5.c \
+	x509/privkey_pkcs8.c x509/pkcs12.c x509/pkcs12_bag.c x509/pkcs12_encr.c \
+	x509/x509_write.c x509/crl_write.c x509/compat.c
 
 COBJECTS = gnutls_record.c gnutls_compress.c debug.c \
 	gnutls_cipher.c gnutls_buffers.c gnutls_handshake.c gnutls_num.c \
@@ -52,13 +59,11 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c \
 	gnutls_str.c gnutls_state.c gnutls_x509.c ext_cert_type.c \
 	gnutls_rsa_export.c auth_rsa_export.c \
 	ext_server_name.c auth_dh_common.c \
-	strnstr.c
+	strnstr.c 
 
 # Separate so we can create the documentation
 
-libgnutls_la_SOURCES = $(COBJECTS) 
-
-libgnutls_la_LIBADD = $(MINITASN1_OBJECTS) x509/libx509.la
+libgnutls_la_SOURCES = $(COBJECTS) $(X509_COBJECTS) $(MINITASN1_COBJECTS)
 
 libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \
 	$(libgnutls_version_script_cmd) \
diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am
index a409848b68..5f59f61d49 100644
--- a/lib/minitasn1/Makefile.am
+++ b/lib/minitasn1/Makefile.am
@@ -1,10 +1,10 @@
+# source files added here must be added to ../Makefile.am
+# to be compiled.
+
 INCLUDES = -I../
 EXTRA_DIST = libtasn1.h der.h mem.h gstr.h errors.h \
-             int.h parser_aux.h structure.h errors_int.h \
-             element.h README
-
-noinst_LTLIBRARIES = libminitasn1.la
-
-libminitasn1_la_SOURCES = decoding.c gstr.c errors.c parser_aux.c \
-           structure.c element.c coding.c
+        int.h parser_aux.h structure.h errors_int.h \
+        element.h README \
+	decoding.c gstr.c errors.c parser_aux.c \
+        structure.c element.c coding.c
 
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 97b7f3021a..02b480920f 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -1,19 +1,15 @@
-INCLUDES = -I../ -I../../includes/ -I../../lib/minitasn1 -I../../libextra/opencdk/ $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
-EXTRA_DIST = dn.h common.h x509.h extensions.h pkcs7.h \
-	x509-api.tex compat.h verify.h mpi.h crq.h sign.h pkcs5.h \
-	privkey.h pkcs12.h rfc2818.h dsa.h
-
-noinst_LTLIBRARIES = libx509.la
+# source files added here must be added to ../Makefile.am
+# to be compiled.
 
 COBJECTS = crl.c dn.c common.c x509.c extensions.c dsa.c \
 	rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c \
 	crq.c xml.c sign.c pkcs5.c privkey_pkcs8.c pkcs12.c \
-	pkcs12_bag.c pkcs12_encr.c x509_write.c crl_write.c
-
-COMPAT_OBJECTS = compat.c
+	pkcs12_bag.c pkcs12_encr.c x509_write.c crl_write.c compat.c
 
+EXTRA_DIST = dn.h common.h x509.h extensions.h pkcs7.h \
+	x509-api.tex compat.h verify.h mpi.h crq.h sign.h pkcs5.h \
+	privkey.h pkcs12.h rfc2818.h dsa.h $(COBJECTS)
 
-libx509_la_SOURCES = $(COBJECTS) $(COMPAT_OBJECTS)
 
 x509-api.tex: $(COBJECTS)
 	@echo "" > x509-api.tex
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