CFGFLAGS ?= --enable-gtk-doc --enable-gtk-doc-pdf --enable-gtk-doc-html $(ADDFLAGS) $(WFLAGS)
PACKAGE ?= gnutls
-.PHONY: config
+.PHONY: config glimport
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/libopts/ -e -args.[ch] -e asn1_tab.c -e ^./tests/suite/`
.DEFAULT_GOAL := bootstrap
endif
-PODIR := po
-PO_DOMAIN := libgnutls
-
local-checks-to-skip = sc_GPL_version sc_bindtextdomain \
sc_immutable_NEWS sc_program_name sc_prohibit_atoi_atof \
+ sc_prohibit_always_true_header_tests \
sc_prohibit_empty_lines_at_EOF sc_prohibit_hash_without_use \
sc_prohibit_have_config_h sc_prohibit_magic_number_exit \
sc_prohibit_strcmp sc_require_config_h \
sc_unmarked_diagnostics sc_useless_cpp_parens \
sc_two_space_separator_in_usage
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|po/.*.po.in|src/crywrap/|(devel/perlasm/|lib/accelerated/x86/|build-aux/|gl/|src/libopts/|tests/suite/ecore/|doc/protocol/).*$$
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|src/.*\.bak|src/crywrap/|(devel/perlasm/|lib/accelerated/x86/|build-aux/|gl/|src/libopts/|tests/suite/ecore/|doc/protocol/).*$$
update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1
# Explicit syntax-check exceptions.
-exclude_file_name_regexp--sc_error_message_period = ^src/crywrap/crywrap.c$$
exclude_file_name_regexp--sc_error_message_uppercase = ^doc/examples/ex-cxx.cpp|guile/src/core.c|src/certtool.c|src/ocsptool.c|src/crywrap/crywrap.c|tests/pkcs12_encode.c$$
exclude_file_name_regexp--sc_file_system = ^doc/doxygen/Doxyfile
exclude_file_name_regexp--sc_prohibit_cvs_keyword = ^lib/nettle/.*$$
exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^tests/nist-pkits/gnutls-nist-tests.html$$
-exclude_file_name_regexp--sc_space_tab = ^doc/.*.(pdf|png)|tests/nist-pkits/|tests/suite/x509paths/.*$$
+exclude_file_name_regexp--sc_space_tab = ^doc/.*.(pdf|png)|\.crl|\.pdf|\.zip|tests/nist-pkits/|tests/data/|tests/system-override-curves.sh|devel/|tests/suite/x509paths/.*|fuzz/.*\.repro|fuzz/.*\.in/.*$$
+_makefile_at_at_check_exceptions = ' && !/CODE_COVERAGE_RULES/ && !/VERSION/'
+exclude_file_name_regexp--sc_m4_quote_check='lib/unistring/m4/absolute-header.m4'
+exclude_file_name_regexp--sc_makefile_at_at_check='lib/unistring/Makefile.am'
+exclude_file_name_regexp--sc_prohibit_stddef_without_use='u*-normalize.c'
+exclude_file_name_regexp--sc_prohibit_strncpy='unistr.in.h'
+exclude_file_name_regexp--sc_prohibit_strncpy='lib/inih/ini.c'
+gl_public_submodule_commit =
autoreconf:
- for f in $(PODIR)/*.po.in; do \
- cp $$f `echo $$f | sed 's/.in//'`; \
- done
- mv build-aux/config.rpath build-aux/config.rpath-
- autopoint
- rm -f m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intldir.m4 m4/intl.m4 m4/intlmacosx.m4 m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes-pri.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/lock.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/visibility.m4 m4/xsize.m4
- touch ChangeLog
- test -f ./configure || AUTOPOINT=true autoreconf --install
- mv build-aux/config.rpath- build-aux/config.rpath
-
-update-po: refresh-po
- for f in `ls $(PODIR)/*.po | grep -v quot.po`; do \
- cp $$f $$f.in; \
- done
- git add $(PODIR)/*.po.in
- git commit -m "Sync with TP." $(PODIR)/LINGUAS $(PODIR)/*.po.in
+ ./bootstrap
config:
./configure $(CFGFLAGS)
bootstrap: autoreconf .submodule.stamp
-# The only non-lgpl modules used are: gettime progname timespec. Those
-# are not used (and must not be used) in the library)
glimport:
- ../gnulib/gnulib-tool --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --lgpl=2 --add-import
- ../gnulib/gnulib-tool --dir=. --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --add-import
+ pushd gnulib && git checkout master && git pull && popd
+ echo "If everything looks well, commit the gnulib update with:"
+ echo " git commit -m "Update gnulib submodule" gnulib"
# Code Coverage
-pre-coverage:
- ./configure --disable-cxx
- ln -s . gl/tests/glthread/glthread
- ln -sf /usr/local/share/gaa/gaa.skel src/gaa.skel
-
-web-coverage:
- rm -fv `find $(htmldir)/coverage -type f | grep -v CVS`
- cp -rv doc/coverage/* $(htmldir)/coverage/
-
-upload-web-coverage:
- cd $(htmldir) && \
- cvs commit -m "Update." coverage
-
-# Clang
-
clang:
- make clean
+ $(MAKE) clean
scan-build ./configure
rm -rf scan.tmp
- scan-build -o scan.tmp make
+ scan-build -o scan.tmp $(MAKE)
clang-copy:
rm -fv `find $(htmldir)/clang -type f | grep -v CVS`
mkdir -p $(htmldir)/clang/
cp -rv scan.tmp/*/* $(htmldir)/clang/
-clang-upload:
- cd $(htmldir) && \
- cvs add clang || true && \
- cvs add clang/*.css clang/*.js clang/*.html || true && \
- cvs commit -m "Update." clang
-
# Release
+# ChangeLog must be PHONY, else it isn't generated on 'make distcheck'
+.PHONY: ChangeLog
ChangeLog:
- git log --pretty --numstat --summary --since="2014 November 07" -- | git2cl > ChangeLog
- cat .clcopying >> ChangeLog
+ (cd "$(srcdir)" ; if test -d .git ; then git log --no-merges --no-decorate --pretty --since="2014 November 07"|grep -v ^'commit' ; else echo "Empty" ; fi) > ChangeLog
tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
-htmldir = ../www-$(PACKAGE)
-release: syntax-check prepare upload web upload-web
+release: syntax-check prepare upload-tarballs
prepare:
! git tag -l $(tag) | grep $(PACKAGE) > /dev/null
- rm -f ChangeLog
- $(MAKE) ChangeLog distcheck
- $(MAKE) -C doc/manpages/ manpages-update
- git commit -m Generated. ChangeLog
- git tag -u b565716f! -m $(VERSION) $(tag)
-
-upload-tarballs:
- git push
- git push --tags
- build-aux/gnupload --to alpha.gnu.org:$(PACKAGE) $(distdir).tar.xz
- build-aux/gnupload --to alpha.gnu.org:$(PACKAGE) $(distdir).tar.lz
- cp $(distdir).tar.xz $(distdir).tar.xz.sig ../releases/$(PACKAGE)/
- cp $(distdir).tar.lz $(distdir).tar.lz.sig ../releases/$(PACKAGE)/
+ git tag -u 96865171! -m $(VERSION) $(tag)
+upload-tarballs: dist
+ gpg --sign --detached $(distdir).tar.xz
+ scp $(distdir).tar.xz* trithemius.gnupg.org:/home/ftp/gcrypt/gnutls/v$(MAJOR_VERSION).$(MINOR_VERSION)
web:
echo generating documentation for $(PACKAGE)
- make -C doc gnutls.html
+ mkdir -p $(htmldir)/manual
+ mkdir -p $(htmldir)/reference
+ $(MAKE) -C doc gnutls.html
cd doc && cp gnutls.html *.png ../$(htmldir)/manual/
cd doc && makeinfo --html --split=node -o ../$(htmldir)/manual/html_node/ --css-include=./texinfo.css gnutls.texi
cd doc && cp *.png ../$(htmldir)/manual/html_node/
sed 's/\@VERSION\@/$(VERSION)/g' -i $(htmldir)/manual/html_node/*.html $(htmldir)/manual/gnutls.html
- -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
- cd doc/latex && make gnutls.pdf && cp gnutls.pdf ../../$(htmldir)/manual/
- make -C doc gnutls-guile.html gnutls-guile.pdf
+ -cd doc && $(MAKE) gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
+ cd doc/latex && $(MAKE) gnutls.pdf && cp gnutls.pdf ../../$(htmldir)/manual/
+ $(MAKE) -C doc gnutls-guile.html gnutls-guile.pdf
cd doc && makeinfo --html --split=node -o ../$(htmldir)/manual/gnutls-guile/ --css-include=./texinfo.css gnutls-guile.texi
cd doc && cp gnutls-guile.pdf gnutls-guile.html ../$(htmldir)/manual/
- #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) && \
- cvs commit -m "Update." manual/ reference/ \
- doxygen/ devel/ cyclo/
+ -cp -v doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.devhelp* doc/reference/html/*.css $(htmldir)/reference/
ASM_SOURCES_XXX := \
- lib/accelerated/x86/XXX/cpuid-x86_64.s \
- lib/accelerated/x86/XXX/cpuid-x86.s \
+ lib/accelerated/aarch64/XXX/ghash-aarch64.s \
+ lib/accelerated/aarch64/XXX/aes-aarch64.s \
+ lib/accelerated/aarch64/XXX/sha1-armv8.s \
+ lib/accelerated/aarch64/XXX/sha256-armv8.s \
+ lib/accelerated/aarch64/XXX/sha512-armv8.s \
lib/accelerated/x86/XXX/ghash-x86_64.s \
lib/accelerated/x86/XXX/aesni-x86_64.s \
lib/accelerated/x86/XXX/aesni-x86.s \
lib/accelerated/x86/XXX/sha1-ssse3-x86.s \
lib/accelerated/x86/XXX/sha1-ssse3-x86_64.s \
lib/accelerated/x86/XXX/sha256-ssse3-x86.s \
+ lib/accelerated/x86/XXX/sha256-ssse3-x86_64.s \
lib/accelerated/x86/XXX/sha512-ssse3-x86.s \
lib/accelerated/x86/XXX/sha512-ssse3-x86_64.s \
lib/accelerated/x86/XXX/aesni-gcm-x86_64.s \
asm-sources-clean:
rm -f $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/accelerated/x86/files.mk
-X86_FILES=XXX/aesni-x86.s XXX/cpuid-x86.s XXX/sha1-ssse3-x86.s \
+X86_FILES=XXX/aesni-x86.s XXX/sha1-ssse3-x86.s \
XXX/sha256-ssse3-x86.s XXX/sha512-ssse3-x86.s XXX/aes-ssse3-x86.s
-X86_64_FILES=XXX/aesni-x86_64.s XXX/cpuid-x86_64.s XXX/ghash-x86_64.s \
+X86_64_FILES=XXX/aesni-x86_64.s XXX/ghash-x86_64.s \
XXX/sha1-ssse3-x86_64.s XXX/sha512-ssse3-x86_64.s XXX/aes-ssse3-x86_64.s \
- XXX/aesni-gcm-x86_64.s
+ XXX/aesni-gcm-x86_64.s XXX/sha256-ssse3-x86_64.s
X86_PADLOCK_FILES=XXX/e_padlock-x86.s
X86_64_PADLOCK_FILES=XXX/e_padlock-x86_64.s
# Appro's code
lib/accelerated/x86/elf/%.s: devel/perlasm/%.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< elf >> $@
+ CC=gcc perl $< elf $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
lib/accelerated/x86/coff/%-x86.s: devel/perlasm/%-x86.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< coff >> $@
+ CC=gcc perl $< coff $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
lib/accelerated/x86/coff/%-x86_64.s: devel/perlasm/%-x86_64.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< mingw64 >> $@
+ CC=gcc perl $< mingw64 $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
lib/accelerated/x86/macosx/%.s: devel/perlasm/%.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< macosx >> $@
+ CC=gcc perl $< macosx $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
+
+lib/accelerated/aarch64/elf/%.s: devel/perlasm/%.pl .submodule.stamp
+ rm -f $@tmp
+ CC=aarch64-linux-gnu-gcc perl $< linux64 $@.tmp
+ cat $@.tmp | /usr/bin/perl -ne '/^#(line)?\s*[0-9]+/ or print' > $@.tmp.S
+ echo "" >> $@.tmp.S
+ sed -i 's/OPENSSL_armcap_P/_gnutls_arm_cpuid_s/g' $@.tmp.S
+ sed -i 's/arm_arch.h/aarch64-common.h/g' $@.tmp.S
+ aarch64-linux-gnu-gcc -D__ARM_MAX_ARCH__=8 -Ilib/accelerated/aarch64 -Wa,--noexecstack -E $@.tmp.S -o $@.tmp.s
+ cat $<.license $@.tmp.s > $@
+ echo ".section .note.GNU-stack,\"\",%progbits" >> $@
+ rm -f $@.tmp.S $@.tmp.s $@.tmp
+
+lib/accelerated/aarch64/macosx/%.s: devel/perlasm/%.pl .submodule.stamp
+ rm -f $@tmp
+ CC=aarch64-linux-gnu-gcc perl $< ios64 $@.tmp
+ cat $@.tmp | /usr/bin/perl -ne '/^#(line)?\s*[0-9]+/ or print' > $@.tmp.S
+ echo "" >> $@.tmp.S
+ sed -i 's/OPENSSL_armcap_P/_gnutls_arm_cpuid_s/g' $@.tmp.S
+ sed -i 's/arm_arch.h/aarch64-common.h/g' $@.tmp.S
+ aarch64-linux-gnu-gcc -D__ARM_MAX_ARCH__=8 -Ilib/accelerated/aarch64 -Wa,--noexecstack -E $@.tmp.S -o $@.tmp.s
+ cat $<.license $@.tmp.s > $@
+ rm -f $@.tmp.S $@.tmp.s $@.tmp
+
+lib/accelerated/aarch64/coff/%.s: devel/perlasm/%.pl .submodule.stamp
+ @true
git.samba.org / gd / gnutls / blobdiff