[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_2-1-g1f2742f

[Nikos Mavrogiannopoulos]

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=1f2742f85da1aa1f4c73c44d7fdf1a8f41c82c7d

The branch, gnutls_2_12_x has been updated
       via  1f2742f85da1aa1f4c73c44d7fdf1a8f41c82c7d (commit)
      from  3f467564d1769df0c34d6bfe1b243f083eee460c (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 1f2742f85da1aa1f4c73c44d7fdf1a8f41c82c7d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Apr 8 19:07:30 2011 +0200

    updated

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 7fea00e..2c9d101 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -22,8 +22,9 @@
 WFLAGS ?= --enable-gcc-warnings
 ADDFLAGS ?=
 CFGFLAGS ?= --enable-gtk-doc --enable-gtk-doc-pdf $(ADDFLAGS) $(WFLAGS)
+PACKAGE ?= gnutls
 
-INDENT_SOURCES = `find . -name \*.[ch] -o -name gnutls.h.in | grep -v -e 
^./build-aux/ -e ^./lib/minitasn1/ -e ^./lib/build-aux/ -e ^./lib/gl/ -e ^./gl/ 
-e ^./libextra/gl/ -e ^./src/cfg/ -e -gaa.[ch] -e asn1_tab.c -e ^./tests/suite/`
+INDENT_SOURCES = `find . -name \*.[ch] -o -name gnutls.h.in | grep -v -e 
^./build-aux/ -e ^./lib/minitasn1/ -e ^./lib/build-aux/ -e ^./gl/ -e 
^./src/cfg/ -e -gaa.[ch] -e asn1_tab.c -e ^./tests/suite/`
 
 ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
 .DEFAULT_GOAL := bootstrap
@@ -46,7 +47,7 @@ autoreconf:
        done
        mv lib/build-aux/config.rpath lib/build-aux/config.rpath-
        test -f ./configure || autoreconf --install
-       test `hostname` = "gaggia" && cp lib/gl/m4/size_max.m4 lib/m4/ || true
+       test `hostname` = "gaggia" && cp gl/m4/size_max.m4 m4/ || true
        mv lib/build-aux/config.rpath- lib/build-aux/config.rpath
 
 update-po: refresh-po
@@ -59,10 +60,20 @@ update-po: refresh-po
 bootstrap: autoreconf
        ./configure $(CFGFLAGS)
 
+#Two runs the first should add the LGPL components and the
+#second the components used by src/ files.
 glimport:
-       gnulib-tool --m4-base gl/m4 --add-import
-       cd lib && gnulib-tool --m4-base gl/m4 --add-import
-       cd libextra && gnulib-tool --m4-base gl/m4 --add-import
+       gnulib-tool --m4-base gl/m4 --tests-base=gl/tests --libtool \
+       --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl \
+       --aux-dir=build-aux --with-tests --avoid=alignof-tests 
--avoid=lseek-tests \
+       --import crypto/hmac-md5 crypto/md5 extensions havelib lib-msvc-compat 
lib-symbol-versions \
+       byteswap c-ctype func gettext lib-msvc-compat lib-symbol-versions 
memmem-simple minmax \
+       netdb read-file snprintf sockets socklen stdint strcase strverscmp 
sys_socket sys_stat time_r unistd \
+       vasprintf vsnprintf manywarnings warnings netinet_in alloca getpass u64
+       gnulib-tool --m4-base gl/m4 --tests-base=gl/tests --libtool \
+       --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl \
+       --aux-dir=build-aux --with-tests --avoid=alignof-tests 
--avoid=lseek-tests \
+       --add-import progname version-etc timespec version-etc-fsf gettime 
valgrind-tests
 
 # Code Coverage
 
@@ -113,12 +124,13 @@ upload:
        cp $(distdir).tar.bz2 $(distdir).tar.bz2.sig ../releases/$(PACKAGE)/
 
 web:
+       echo generating documentation for $(PACKAGE)
        cd doc && $(SHELL) ../build-aux/gendocs.sh \
                --html "--css-include=texinfo.css" \
-               -o ../$(htmldir)/devel/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
-       cd doc/doxygen && doxygen && cd ../.. && cp -v doc/doxygen/html/* 
$(htmldir)/devel/doxygen/ && cd doc/doxygen/latex && make refman.pdf && cd 
../../../ && cp doc/doxygen/latex/refman.pdf 
$(htmldir)/devel/doxygen/$(PACKAGE).pdf
-       cp -v doc/reference/$(PACKAGE).pdf doc/reference/html/*.html 
doc/reference/html/*.png doc/reference/html/*.devhelp doc/reference/html/*.css 
$(htmldir)/devel/reference/
-       cp -v doc/cyclo/cyclo-$(PACKAGE).html $(htmldir)/cyclo/
+               -o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
+       #cd doc/doxygen && doxygen && cd ../.. && cp -v doc/doxygen/html/* 
$(htmldir)/devel/doxygen/ && cd doc/doxygen/latex && make refman.pdf && cd 
../../../ && cp doc/doxygen/latex/refman.pdf 
$(htmldir)/devel/doxygen/$(PACKAGE).pdf
+       cp -v doc/reference/html/*.html doc/reference/html/*.png 
doc/reference/html/*.devhelp doc/reference/html/*.css $(htmldir)/reference/
+       #cp -v doc/cyclo/cyclo-$(PACKAGE).html $(htmldir)/cyclo/
 
 upload-web:
        cd $(htmldir) && \


hooks/post-receive
-- 
GNU gnutls