[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-72-g63cd0dc
From: |
Simon Josefsson |
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-72-g63cd0dc |
Date: |
Wed, 18 Jan 2012 19:02:26 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=63cd0dc560bc45607b711da503119805352a0857
The branch, master has been updated
via 63cd0dc560bc45607b711da503119805352a0857 (commit)
from df895da2766c27b7e4858ed98efbc08555902c44 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63cd0dc560bc45607b711da503119805352a0857
Author: Simon Josefsson <address@hidden>
Date: Wed Jan 18 20:02:16 2012 +0100
Fix doc/enums/ generation to work with 'make distcheck'.
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.am | 78 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7187629..4fc27c4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -199,10 +199,10 @@ crypto-api.texi:
$(top_srcdir)/lib/includes/gnutls/crypto.h
# Generated texinfos.
# for some reason it does not work when cross compiling
if !WINDOWS
-gnutls_TEXINFOS += error_codes.texi algorithms.texi alerts.texi enums.texi
+gnutls_TEXINFOS += error_codes.texi algorithms.texi alerts.texi enums.texi
endif
-MAINTAINERCLEANFILES += error_codes.texi algorithms.texi enums.texi
+DISTCLEANFILES = error_codes.texi algorithms.texi alerts.texi enums.texi
AM_CPPFLAGS = \
-I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \
@@ -220,15 +220,17 @@ alert_printlist_SOURCES = alert-printlist.c
alert_printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
error_codes.texi: $(top_srcdir)/lib/gnutls_errors.c $(srcdir)/errcodes.c
- make $(builddir)/errcodes
+ $(MAKE) $(builddir)/errcodes
$(builddir)/errcodes > address@hidden
mv -f address@hidden $@
-algorithms.texi: printlist
+algorithms.texi: $(top_srcdir)/lib/algorithms/ciphers.c $(srcdir)/printlist.c
+ $(MAKE) $(builddir)/printlist
$(builddir)/printlist > address@hidden
mv -f address@hidden $@
-alerts.texi: alert-printlist
+alerts.texi: $(top_srcdir)/lib/gnutls_alert.c $(srcdir)/alert-printlist.c
+ $(MAKE) $(builddir)/alert-printlist
$(builddir)/alert-printlist > address@hidden
mv -f address@hidden $@
@@ -239,9 +241,69 @@ enums.texi: $(srcdir)/../lib/includes/gnutls/*.h
$(builddir)/../lib/includes/gnu
$(srcdir)/scripts/gdoc -texinfo $$i >> address@hidden && \
echo "ok"; \
done
- $(srcdir)/scripts/split-texi.pl enums enum < address@hidden
mv -f address@hidden $@
+ENUMS =
+ENUMS += enums/gnutls_alert_description_t
+ENUMS += enums/gnutls_alert_level_t
+ENUMS += enums/gnutls_certificate_import_flags
+ENUMS += enums/gnutls_certificate_print_formats_t
+ENUMS += enums/gnutls_certificate_request_t
+ENUMS += enums/gnutls_certificate_status_t
+ENUMS += enums/gnutls_certificate_type_t
+ENUMS += enums/gnutls_certificate_verify_flags
+ENUMS += enums/gnutls_channel_binding_t
+ENUMS += enums/gnutls_cipher_algorithm_t
+ENUMS += enums/gnutls_close_request_t
+ENUMS += enums/gnutls_compression_method_t
+ENUMS += enums/gnutls_credentials_type_t
+ENUMS += enums/gnutls_digest_algorithm_t
+ENUMS += enums/gnutls_ecc_curve_t
+ENUMS += enums/gnutls_handshake_description_t
+ENUMS += enums/gnutls_kx_algorithm_t
+ENUMS += enums/gnutls_mac_algorithm_t
+ENUMS += enums/gnutls_openpgp_crt_fmt_t
+ENUMS += enums/gnutls_openpgp_crt_status_t
+ENUMS += enums/gnutls_params_type_t
+ENUMS += enums/gnutls_pk_algorithm_t
+ENUMS += enums/gnutls_pkcs11_obj_attr_t
+ENUMS += enums/gnutls_pkcs11_obj_info_t
+ENUMS += enums/gnutls_pkcs11_obj_type_t
+ENUMS += enums/gnutls_pkcs11_token_info_t
+ENUMS += enums/gnutls_pkcs12_bag_type_t
+ENUMS += enums/gnutls_pkcs_encrypt_flags_t
+ENUMS += enums/gnutls_privkey_type_t
+ENUMS += enums/gnutls_protocol_t
+ENUMS += enums/gnutls_psk_key_flags
+ENUMS += enums/gnutls_rnd_level_t
+ENUMS += enums/gnutls_sec_param_t
+ENUMS += enums/gnutls_server_name_type_t
+ENUMS += enums/gnutls_sign_algorithm_t
+ENUMS += enums/gnutls_supplemental_data_format_type_t
+ENUMS += enums/gnutls_x509_crt_fmt_t
+ENUMS += enums/gnutls_x509_subject_alt_name_t
+
+gnutls_TEXINFOS += $(ENUMS)
+DISTCLEANFILES += $(ENUMS)
+
+$(ENUMS): enums.texi
+ $(MAKE) compare-makefile
+ -mkdir enums
+ $(srcdir)/scripts/split-texi.pl enums enum < enums.texi
+
+compare-makefile:
+ ENUMS=`grep 'address@hidden ' enums.texi | sed 's/@c //g' | sort`; \
+ STR=""; \
+ for i in $$ENUMS; do \
+ STR="$$STR\nENUMS += enums/$$i"; \
+ done; \
+ grep -v -e '^ENUMS += ' $(srcdir)/Makefile.am | \
+ perl -p -e "s,^ENUMS =,ENUMS =$$STR," > tmp-$@; \
+ diff -u $(srcdir)/Makefile.am tmp-$@
+ rm -f tmp-$@
+
+.PHONY: compare-makefile
+
# Guile texinfos.
guile_texi = core.c.texi
@@ -275,7 +337,3 @@ core.c.texi:
echo "(Guile not available, documentation not generated.)" > $@
endif !HAVE_GUILE
-
-clean-am:
- rm -rf enums gnutls.info gnutls.html gnutls.pdf enums.texi
-
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-72-g63cd0dc,
Simon Josefsson <=