Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -2,10 +2,11 @@ nano.o randombytes.o blake2b.o tweetnacl.o nano.syms +nano.vers nano.tcl.h Makefile pkgIndex.tcl-shared pkgIndex.tcl-static pkgIndex.tcl Index: Makefile.in ================================================================== --- Makefile.in +++ Makefile.in @@ -71,9 +71,11 @@ rm -f config.log config.status rm -f nano.tcl.h nano.tcl.h.new.1 nano.tcl.h.new.2 mrproper: distclean rm -f configure aclocal.m4 config.guess config.sub install-sh + rm -f nano.vers rm -rf tweetnacl blake2b - rm -rf build/tweetnacl/out build/blake2b/out + $(MAKE) -C build/tweetnacl distclean + $(MAKE) -C build/blake2b distclean .PHONY: all test clean distclean mrproper Index: autogen.sh ================================================================== --- autogen.sh +++ autogen.sh @@ -1,6 +1,8 @@ #! /usr/bin/env bash + +set -e update='0' if [ "$1" = '-update' ]; then update='1' fi @@ -30,11 +32,11 @@ exit 1 fi cd "$(dirname "$(which "$0")")" || exit 1 -mkdir aclocal >/dev/null 2>/dev/null +mkdir aclocal >/dev/null 2>/dev/null || : files=() for url in "${urls[@]}"; do file="aclocal/$(echo "${url}" | sed 's@^.*/@@')" @@ -65,24 +67,34 @@ rm -f aclocal.m4.new else mv aclocal.m4.new aclocal.m4 fi -automake --add-missing --copy --force-missing >/dev/null 2>/dev/null +automake --add-missing --copy --force-missing >/dev/null 2>/dev/null || : if ! [ -f install-sh -o -f install.sh -o -f shtool ]; then echo "automake failed" >&2 exit 1 fi autoconf rm -rf autom4te.cache -set -e - # Assemble tweetnacl rm -rf tweetnacl make -C build/tweetnacl install PREFIX="$(pwd)/tweetnacl" # Assemble blake2b rm -rf blake2b make -C build/blake2b install PREFIX="$(pwd)/blake2b" + +# Assemble version script +rm -f nano.vers +( + echo '{' + echo $'\tglobal:' + sed 's/@SYMPREFIX@/\t\t/g;s/$/;/' nano.syms.in + echo $'\tlocal:' + echo $'\t\t*;' + echo '};' +) > nano.vers + DELETED nano.vers Index: nano.vers ================================================================== --- nano.vers +++ /dev/null @@ -1,6 +0,0 @@ -{ - global: - Nano_Init; - local: - *; -};