small fix-ups

.gitignore

@@ -72,6 +72,19 @@ timing.exe
 *.gcov
 libtomcrypt.pc
 
+# output from doc generation
+doxygen/
+*.dvi
+*.log
+*.aux
+*.toc
+*.idx
+*.ilg
+*.ind
+*.out
+*.lof
+*.bak
+
 coverage/
 coverage*.info
 

makefile

@@ -139,4 +139,6 @@ coverage: test
 # cleans everything - coverage output and standard 'clean'
 cleancov: cleancov-clean clean
 
-# git commit: $Format:%h$ $Format:%ai$
+# ref:         $Format:%D$
+# git commit:  $Format:%H$
+# commit time: $Format:%ai$

makefile_include.mk

@@ -384,19 +384,23 @@ clean:
 	rm -rf `find . -type d -name "*.libs" | xargs`
 	$(MAKE) -C doc/ clean
 
-zipup: docs
+zipup: doc/crypt.pdf
+	@# Update the index, so diff-index won't fail in case the pdf has been created.
+	@#   As the pdf creation modifies crypt.tex, git sometimes detects the
+	@#   modified file, but misses that it's put back to its original version.
+	@git update-index --refresh
 	@git diff-index --quiet HEAD -- || ( echo "FAILURE: uncommited changes or not a git" && exit 1 )
 	@perl helper.pl --check-all || ( echo "FAILURE: helper.pl --check-all errors" && exit 1 )
-	rm -rf libtomcrypt-$(VERSION) libtomcrypt-$(VERSION).*
-	# files/dirs excluded from "git archive" are defined in .gitattributes
+	rm -rf libtomcrypt-$(VERSION) crypt-$(VERSION).*
+	@# files/dirs excluded from "git archive" are defined in .gitattributes
 	git archive --format=tar --prefix=libtomcrypt-$(VERSION)/ HEAD | tar x
 	mkdir -p libtomcrypt-$(VERSION)/doc
 	cp doc/crypt.pdf libtomcrypt-$(VERSION)/doc/crypt.pdf
-	tar -cJf libtomcrypt-$(VERSION).tar.xz libtomcrypt-$(VERSION)
-	zip -9rq libtomcrypt-$(VERSION).zip libtomcrypt-$(VERSION)
+	tar -c libtomcrypt-$(VERSION)/ | xz -6e -c - > crypt-$(VERSION).tar.xz
+	zip -9rq crypt-$(VERSION).zip libtomcrypt-$(VERSION)
 	rm -rf libtomcrypt-$(VERSION)
-	gpg -b -a libtomcrypt-$(VERSION).tar.xz
-	gpg -b -a libtomcrypt-$(VERSION).zip
+	gpg -b -a crypt-$(VERSION).tar.xz
+	gpg -b -a crypt-$(VERSION).zip
 
 codecheck:
 	perl helper.pl -a

printinfo.sh

@@ -3,7 +3,7 @@
 version=$(git describe --tags --always --dirty 2>/dev/null)
 if [ ! -e ".git" ] || [ -z $version ]
 then
-   version=$(grep "^VERSION=" makefile.include | sed "s/.*=//")
+   version=$(grep "^VERSION=" makefile_include.mk | sed "s/.*=//")
 fi
 echo "Testing version:" $version
 #grep "VERSION=" makefile | perl -e "@a = split('=', <>); print @a[1];"`

updatemakes.sh

@@ -2,7 +2,7 @@
 
 ./helper.pl --update-makefiles || exit 1
 
-makefiles=(makefile makefile.include makefile.shared makefile.unix makefile.mingw makefile.msvc)
+makefiles=(makefile makefile_include.mk makefile.shared makefile.unix makefile.mingw makefile.msvc)
 vcproj=(libtomcrypt_VS2008.vcproj)
 
 if [ $# -eq 1 ] && [ "$1" == "-c" ]; then