updated makefiles for the new functions

3 files changed, 68 insertions, 7 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1e7edd7382..9a8ebb700e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -267,7 +267,7 @@ pkcs12-api.texi: $(top_srcdir)/lib/includes/gnutls/pkcs12.h
 		echo $(ECHO_N) "Creating documentation for $$i... " && \
 		$(srcdir)/scripts/gdoc -texinfo \
 			-function $$i \
-			$(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) >> $@-tmp 2>/dev/null && \
 		echo "ok"; \
 	done
 	mv -f $@-tmp $@
@@ -289,7 +289,7 @@ pkcs7-api.texi: $(top_srcdir)/lib/includes/gnutls/pkcs7.h
 		echo $(ECHO_N) "Creating documentation for $$i... " && \
 		$(srcdir)/scripts/gdoc -texinfo \
 			-function $$i \
-			$(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) >> $@-tmp 2>/dev/null && \
 		echo "ok"; \
 	done
 	mv -f $@-tmp $@
@@ -357,7 +357,7 @@ ocsp-api.texi: $(top_srcdir)/lib/includes/gnutls/ocsp.h
 		echo $(ECHO_N) "Creating documentation for $$i... " && \
 		$(srcdir)/scripts/gdoc -texinfo \
 			-function $$i \
-			$(C_SOURCE_FILES) >> $@-tmp 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) >> $@-tmp 2>/dev/null && \
 		echo "ok"; \
 	done
 	mv -f $@-tmp $@
@@ -1339,6 +1339,8 @@ FUNCS += functions/gnutls_pkcs11_get_raw_issuer
 FUNCS += functions/gnutls_pkcs11_get_raw_issuer.short
 FUNCS += functions/gnutls_pkcs11_get_raw_issuer_by_dn
 FUNCS += functions/gnutls_pkcs11_get_raw_issuer_by_dn.short
+FUNCS += functions/gnutls_pkcs11_get_raw_issuer_by_subject_key_id
+FUNCS += functions/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.short
 FUNCS += functions/gnutls_pkcs11_init
 FUNCS += functions/gnutls_pkcs11_init.short
 FUNCS += functions/gnutls_pkcs11_obj_deinit
@@ -1477,6 +1479,10 @@ FUNCS += functions/gnutls_pkcs12_simple_parse
 FUNCS += functions/gnutls_pkcs12_simple_parse.short
 FUNCS += functions/gnutls_pkcs12_verify_mac
 FUNCS += functions/gnutls_pkcs12_verify_mac.short
+FUNCS += functions/gnutls_pkcs7_add_attr
+FUNCS += functions/gnutls_pkcs7_add_attr.short
+FUNCS += functions/gnutls_pkcs7_attrs_deinit
+FUNCS += functions/gnutls_pkcs7_attrs_deinit.short
 FUNCS += functions/gnutls_pkcs7_deinit
 FUNCS += functions/gnutls_pkcs7_deinit.short
 FUNCS += functions/gnutls_pkcs7_delete_crl
@@ -1487,18 +1493,28 @@ FUNCS += functions/gnutls_pkcs7_export
 FUNCS += functions/gnutls_pkcs7_export.short
 FUNCS += functions/gnutls_pkcs7_export2
 FUNCS += functions/gnutls_pkcs7_export2.short
+FUNCS += functions/gnutls_pkcs7_get_attr
+FUNCS += functions/gnutls_pkcs7_get_attr.short
 FUNCS += functions/gnutls_pkcs7_get_crl_count
 FUNCS += functions/gnutls_pkcs7_get_crl_count.short
 FUNCS += functions/gnutls_pkcs7_get_crl_raw
 FUNCS += functions/gnutls_pkcs7_get_crl_raw.short
+FUNCS += functions/gnutls_pkcs7_get_crl_raw2
+FUNCS += functions/gnutls_pkcs7_get_crl_raw2.short
 FUNCS += functions/gnutls_pkcs7_get_crt_count
 FUNCS += functions/gnutls_pkcs7_get_crt_count.short
 FUNCS += functions/gnutls_pkcs7_get_crt_raw
 FUNCS += functions/gnutls_pkcs7_get_crt_raw.short
+FUNCS += functions/gnutls_pkcs7_get_crt_raw2
+FUNCS += functions/gnutls_pkcs7_get_crt_raw2.short
+FUNCS += functions/gnutls_pkcs7_get_signature_info
+FUNCS += functions/gnutls_pkcs7_get_signature_info.short
 FUNCS += functions/gnutls_pkcs7_import
 FUNCS += functions/gnutls_pkcs7_import.short
 FUNCS += functions/gnutls_pkcs7_init
 FUNCS += functions/gnutls_pkcs7_init.short
+FUNCS += functions/gnutls_pkcs7_print
+FUNCS += functions/gnutls_pkcs7_print.short
 FUNCS += functions/gnutls_pkcs7_set_crl
 FUNCS += functions/gnutls_pkcs7_set_crl.short
 FUNCS += functions/gnutls_pkcs7_set_crl_raw
@@ -1507,6 +1523,14 @@ FUNCS += functions/gnutls_pkcs7_set_crt
 FUNCS += functions/gnutls_pkcs7_set_crt.short
 FUNCS += functions/gnutls_pkcs7_set_crt_raw
 FUNCS += functions/gnutls_pkcs7_set_crt_raw.short
+FUNCS += functions/gnutls_pkcs7_sign
+FUNCS += functions/gnutls_pkcs7_sign.short
+FUNCS += functions/gnutls_pkcs7_signature_info_deinit
+FUNCS += functions/gnutls_pkcs7_signature_info_deinit.short
+FUNCS += functions/gnutls_pkcs7_verify
+FUNCS += functions/gnutls_pkcs7_verify.short
+FUNCS += functions/gnutls_pkcs7_verify_direct
+FUNCS += functions/gnutls_pkcs7_verify_direct.short
 FUNCS += functions/gnutls_pkcs8_info
 FUNCS += functions/gnutls_pkcs8_info.short
 FUNCS += functions/gnutls_pkcs_schema_get_name
@@ -2397,6 +2421,8 @@ FUNCS += functions/gnutls_x509_crt_sign2
 FUNCS += functions/gnutls_x509_crt_sign2.short
 FUNCS += functions/gnutls_x509_crt_verify
 FUNCS += functions/gnutls_x509_crt_verify.short
+FUNCS += functions/gnutls_x509_crt_verify_data2
+FUNCS += functions/gnutls_x509_crt_verify_data2.short
 FUNCS += functions/gnutls_x509_dn_deinit
 FUNCS += functions/gnutls_x509_dn_deinit.short
 FUNCS += functions/gnutls_x509_dn_export
@@ -2405,6 +2431,8 @@ FUNCS += functions/gnutls_x509_dn_export2
 FUNCS += functions/gnutls_x509_dn_export2.short
 FUNCS += functions/gnutls_x509_dn_get_rdn_ava
 FUNCS += functions/gnutls_x509_dn_get_rdn_ava.short
+FUNCS += functions/gnutls_x509_dn_get_str
+FUNCS += functions/gnutls_x509_dn_get_str.short
 FUNCS += functions/gnutls_x509_dn_import
 FUNCS += functions/gnutls_x509_dn_import.short
 FUNCS += functions/gnutls_x509_dn_init
@@ -2585,6 +2613,8 @@ FUNCS += functions/gnutls_x509_trust_list_get_issuer
 FUNCS += functions/gnutls_x509_trust_list_get_issuer.short
 FUNCS += functions/gnutls_x509_trust_list_get_issuer_by_dn
 FUNCS += functions/gnutls_x509_trust_list_get_issuer_by_dn.short
+FUNCS += functions/gnutls_x509_trust_list_get_issuer_by_subject_key_id
+FUNCS += functions/gnutls_x509_trust_list_get_issuer_by_subject_key_id.short
 FUNCS += functions/gnutls_x509_trust_list_init
 FUNCS += functions/gnutls_x509_trust_list_init.short
 FUNCS += functions/gnutls_x509_trust_list_iter_deinit
diff --git a/doc/doc.mk b/doc/doc.mk
index 4024eb861f..62a359fa23 100644
--- a/doc/doc.mk
+++ b/doc/doc.mk
@@ -29,3 +29,5 @@ HEADER_FILES = $(top_srcdir)/lib/includes/gnutls/gnutls.h.in \
 	$(top_srcdir)/lib/includes/gnutls/pkcs7.h
 
 C_SOURCE_FILES = $(top_srcdir)/lib/*/*.c $(top_srcdir)/lib/*.c  $(top_srcdir)/libdane/*.c 
+
+C_X509_SOURCE_FILES = $(top_srcdir)/lib/x509/*.c
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 5ed6d1321a..11002c83f5 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -457,6 +457,7 @@ APIMANS += gnutls_pkcs11_delete_url.3
 APIMANS += gnutls_pkcs11_get_pin_function.3
 APIMANS += gnutls_pkcs11_get_raw_issuer.3
 APIMANS += gnutls_pkcs11_get_raw_issuer_by_dn.3
+APIMANS += gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3
 APIMANS += gnutls_pkcs11_init.3
 APIMANS += gnutls_pkcs11_obj_deinit.3
 APIMANS += gnutls_pkcs11_obj_export.3
@@ -526,21 +527,32 @@ APIMANS += gnutls_pkcs12_mac_info.3
 APIMANS += gnutls_pkcs12_set_bag.3
 APIMANS += gnutls_pkcs12_simple_parse.3
 APIMANS += gnutls_pkcs12_verify_mac.3
+APIMANS += gnutls_pkcs7_add_attr.3
+APIMANS += gnutls_pkcs7_attrs_deinit.3
 APIMANS += gnutls_pkcs7_deinit.3
 APIMANS += gnutls_pkcs7_delete_crl.3
 APIMANS += gnutls_pkcs7_delete_crt.3
 APIMANS += gnutls_pkcs7_export.3
 APIMANS += gnutls_pkcs7_export2.3
+APIMANS += gnutls_pkcs7_get_attr.3
 APIMANS += gnutls_pkcs7_get_crl_count.3
 APIMANS += gnutls_pkcs7_get_crl_raw.3
+APIMANS += gnutls_pkcs7_get_crl_raw2.3
 APIMANS += gnutls_pkcs7_get_crt_count.3
 APIMANS += gnutls_pkcs7_get_crt_raw.3
+APIMANS += gnutls_pkcs7_get_crt_raw2.3
+APIMANS += gnutls_pkcs7_get_signature_info.3
 APIMANS += gnutls_pkcs7_import.3
 APIMANS += gnutls_pkcs7_init.3
+APIMANS += gnutls_pkcs7_print.3
 APIMANS += gnutls_pkcs7_set_crl.3
 APIMANS += gnutls_pkcs7_set_crl_raw.3
 APIMANS += gnutls_pkcs7_set_crt.3
 APIMANS += gnutls_pkcs7_set_crt_raw.3
+APIMANS += gnutls_pkcs7_sign.3
+APIMANS += gnutls_pkcs7_signature_info_deinit.3
+APIMANS += gnutls_pkcs7_verify.3
+APIMANS += gnutls_pkcs7_verify_direct.3
 APIMANS += gnutls_pkcs8_info.3
 APIMANS += gnutls_pkcs_schema_get_name.3
 APIMANS += gnutls_pkcs_schema_get_oid.3
@@ -987,10 +999,12 @@ APIMANS += gnutls_x509_crt_set_version.3
 APIMANS += gnutls_x509_crt_sign.3
 APIMANS += gnutls_x509_crt_sign2.3
 APIMANS += gnutls_x509_crt_verify.3
+APIMANS += gnutls_x509_crt_verify_data2.3
 APIMANS += gnutls_x509_dn_deinit.3
 APIMANS += gnutls_x509_dn_export.3
 APIMANS += gnutls_x509_dn_export2.3
 APIMANS += gnutls_x509_dn_get_rdn_ava.3
+APIMANS += gnutls_x509_dn_get_str.3
 APIMANS += gnutls_x509_dn_import.3
 APIMANS += gnutls_x509_dn_init.3
 APIMANS += gnutls_x509_dn_oid_known.3
@@ -1081,6 +1095,7 @@ APIMANS += gnutls_x509_trust_list_add_trust_mem.3
 APIMANS += gnutls_x509_trust_list_deinit.3
 APIMANS += gnutls_x509_trust_list_get_issuer.3
 APIMANS += gnutls_x509_trust_list_get_issuer_by_dn.3
+APIMANS += gnutls_x509_trust_list_get_issuer_by_subject_key_id.3
 APIMANS += gnutls_x509_trust_list_init.3
 APIMANS += gnutls_x509_trust_list_iter_deinit.3
 APIMANS += gnutls_x509_trust_list_iter_get_ca.3
@@ -1161,7 +1176,7 @@ stamp_mans: $(HEADER_FILES)
 			-seeinfo $(PACKAGE) -verbatimcopying \
 			-copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \
 			-function $$i \
-			$(C_SOURCE_FILES) > $$i.3 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) > $$i.3 2>/dev/null && \
 		echo $(ECHO_N) "."; \
 	done
 	@echo ""
@@ -1175,7 +1190,21 @@ stamp_mans: $(HEADER_FILES)
 			-seeinfo $(PACKAGE) -verbatimcopying \
 			-copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \
 			-function $$i \
-			$(C_SOURCE_FILES) > $$i.3 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) > $$i.3 2>/dev/null && \
+		echo $(ECHO_N) "."; \
+	done
+	@echo ""
+	@echo $(ECHO_N) "Creating man pages for pkcs7.h..." && \
+	for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/pkcs7.h`; do \
+		$(top_srcdir)/doc/scripts/gdoc -man \
+			-module $(PACKAGE) -sourceversion $(VERSION) \
+			-bugsto $(PACKAGE_BUGREPORT) \
+			-pkg-site "http://www.gnutls.org" \
+			-include "gnutls/pkcs7.h" \
+			-seeinfo $(PACKAGE) -verbatimcopying \
+			-copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \
+			-function $$i \
+			$(C_X509_SOURCE_FILES) > $$i.3 2>/dev/null && \
 		echo $(ECHO_N) "."; \
 	done
 	@echo ""
@@ -1189,7 +1218,7 @@ stamp_mans: $(HEADER_FILES)
 			-seeinfo $(PACKAGE) -verbatimcopying \
 			-copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \
 			-function $$i \
-			$(C_SOURCE_FILES) > $$i.3 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) > $$i.3 2>/dev/null && \
 		echo $(ECHO_N) "."; \
 	done
 	@echo ""
@@ -1217,7 +1246,7 @@ stamp_mans: $(HEADER_FILES)
 			-seeinfo $(PACKAGE) -verbatimcopying \
 			-copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \
 			-function $$i \
-			$(C_SOURCE_FILES) > $$i.3 2>/dev/null && \
+			$(C_X509_SOURCE_FILES) > $$i.3 2>/dev/null && \
 		echo $(ECHO_N) "."; \
 	done
 	@echo ""