Build x509 files inside x509/, to avoid scattering *.o and *.lo for every

file in x509/ in lib/.

2 files changed, 16 insertions, 22 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7ec259aba4..85d2d56d98 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = x509
+
 INCLUDES = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl -I$(top_srcdir)/libextra -I$(srcdir)/minitasn1 -I$(top_srcdir)/libextra/openpgp/ -I$(top_srcdir)/libextra/opencdk -I$(srcdir)/x509 -I$(top_srcdir)/includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
 bin_SCRIPTS = libgnutls-config
 
@@ -11,27 +13,18 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 
 LIBGNUTLS_EXPORTS = -export-symbols-regex '^(_gnutls|gnutls|_E_).*'
 
-DIST_SUBDIRS = minitasn1 x509
 if ENABLE_MINITASN1
-SUBDIRS = minitasn1 x509
+SUBDIRS += minitasn1
 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_COBJECTS = 
 endif
 
 EXTRA_DIST = libgnutls.vers gnutls-api.texi
 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/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
-
 SRP_COBJECTS = ext_srp.c gnutls_srp.c auth_srp.c auth_srp_passwd.c	\
 	auth_srp_sb64.c auth_srp_rsa.c
 
@@ -70,11 +63,12 @@ HFILES = debug.h gnutls_compress.h defines.h gnutls_cipher.h		\
 
 # Separate so we can create the documentation
 
-libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(X509_COBJECTS)	\
-	$(MINITASN1_COBJECTS) $(SRP_COBJECTS) gnutls.asn pkix.asn
+libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(MINITASN1_COBJECTS)	\
+	$(SRP_COBJECTS) gnutls.asn pkix.asn
 
 libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \
 	../crypto/libgc.la \
+	x509/libgnutls_x509.la \
 	$(LIBGNUTLS_EXPORTS) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index ade8c9979d..74eebdfaac 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -1,15 +1,15 @@
-# source files added here must be added to ../Makefile.am
-# to be compiled.
+INCLUDES = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl -I$(top_srcdir)/libextra -I$(top_srcdir)/lib/minitasn1 -I$(top_srcdir)/libextra/openpgp/ -I$(top_srcdir)/libextra/opencdk -I$(top_srcdir)/lib -I$(top_srcdir)/includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
-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 privkey_pkcs8.c pkcs12.c \
-	pkcs12_bag.c pkcs12_encr.c x509_write.c crl_write.c compat.c
+noinst_LTLIBRARIES = libgnutls_x509.la
 
-EXTRA_DIST = dn.h common.h x509.h extensions.h pkcs7.h \
-	compat.h verify.h mpi.h crq.h sign.h \
-	privkey.h pkcs12.h rfc2818.h dsa.h $(COBJECTS) \
-	x509-api.texi
+libgnutls_x509_la_SOURCES = 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 privkey_pkcs8.c pkcs12.c pkcs12_bag.c	\
+	pkcs12_encr.c x509_write.c crl_write.c compat.c dn.h common.h	\
+	x509.h extensions.h pkcs7.h compat.h verify.h mpi.h crq.h	\
+	sign.h privkey.h pkcs12.h rfc2818.h dsa.h
+
+EXTRA_DIST = x509-api.texi
 
 x509-api.texi: $(COBJECTS)
 	@echo "" > x509-api.texi