Index: Makefile.in
===================================================================
diff -u -r30d8f255d8fe815d3c028096ca5cb355a1548f87 -r41946a0c89313277849261c15dc582985383c969
--- Makefile.in	(.../Makefile.in)	(revision 30d8f255d8fe815d3c028096ca5cb355a1548f87)
+++ Makefile.in	(.../Makefile.in)	(revision 41946a0c89313277849261c15dc582985383c969)
@@ -9,7 +9,8 @@
 # Copyright (c) 1999 Scriptics Corporation.
 # Copyright (c) 2002-2003 ActiveState Corporation.
 # Copyright (c) 2001-2007 Uwe Zdun
-# Copyright (c) 2001-2014 Gustaf Neumann
+# Copyright (c) 2001-2016 Gustaf Neumann
+# Copyright (c) 2016 Stefan Sobernig
 #
 # See the file "tcl-license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -48,6 +49,7 @@
 appdirs		= 
 appsrc		= COPYRIGHT 
 
+CPPCHECK        = cppcheck
 
 # XOTcl subpackage
 xotcl_srcdir	= ${srcdir}/library/xotcl
@@ -159,7 +161,7 @@
 CC		= @CC@
 CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
 # useful for debugging:
-#CFLAGS_DEFAULT	= -pedantic -g -std=c99 -DTCL_NO_DEPRECATED -DTCL_NO_DEPRECATED -Wconversion -Wsign-conversion -Wfloat-conversion -Wsign-compare
+#CFLAGS_DEFAULT	= -pedantic -g -std=c99 -DTCL_NO_DEPRECATED -Wconversion -Wsign-conversion -Wfloat-conversion -Wsign-compare
 CFLAGS_WARNING	= @CFLAGS_WARNING@
 CLEANFILES	= @CLEANFILES@
 EXEEXT		= @EXEEXT@
@@ -186,6 +188,16 @@
 else
   # Do nothing, use the environment variable as is.
 endif
+
+ifeq ($(ASCIIDOC),)
+  ASCIIDOC = PATH=$(src_app_dir_native)/utils:$(PATH) \
+	     asciidoc \
+	     -f $(src_app_dir_native)/utils/asciidoc.conf
+else
+  # Do nothing, use the environment variable as is.
+endif
+
+
 #
 # Not used, but retained for reference of what libs Tcl required
 TCL_LIBS	= @TCL_LIBS@
@@ -208,7 +220,7 @@
 		  TCLLIBPATH="$(top_builddir) ${srcdir} $(TCLLIBPATH)"
 TCLSH_PROG	= @TCLSH_PROG@
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
-# TCLSH		= $(TCLSH_ENV) LD_PRELOAD="$(srcdir)/$(PKG_LIB_FILE)" valgrind --log-fd=9 --leak-check=full --track-origins=yes --show-possibly-lost=no $(TCLSH_PROG) 9>>valgrind.out
+#TCLSH		= $(TCLSH_ENV) LD_PRELOAD="$(srcdir)/$(PKG_LIB_FILE)" valgrind --log-fd=9 --leak-check=full --track-origins=yes --show-possibly-lost=no $(TCLSH_PROG) 9>>valgrind.out
 SHARED_BUILD	= @SHARED_BUILD@
 
 INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @NSF_BUILD_INCLUDE_SPEC@
@@ -266,7 +278,7 @@
 
 %.html : %.tcl
 	$(TCLSH) $(src_app_dir_native)/utils/source-doc-beautifier.tcl $<
-	PATH=$(src_app_dir_native)/utils:$(PATH) asciidoc -f $(src_app_dir_native)/utils/asciidoc.conf $*.txt
+	$(ASCIIDOC) $*.txt
 
 #========================================================================
 # TEA TARGETS.  Please note that the "libraries:" target refers to platform
@@ -298,7 +310,7 @@
 	done; fi;
 
 cppcheck:
-	cppcheck --enable=all generic/*.c $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
+	$(CPPCHECK) --enable=all generic/*.c $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
 		-DNDEBUG=1 -I/usr/include -D__x86_64__
 
 etags:
@@ -320,12 +332,12 @@
 
 # for now, just the two doc files
 doc:
-	(cd $(src_doc_dir); asciidoc next-migration.txt)
-	(cd $(src_doc_dir)/next-tutorial; asciidoc next-tutorial.txt)
+	$(ASCIIDOC) $(src_doc_dir)/next-migration.txt
+	$(ASCIIDOC) $(src_doc_dir)/next-tutorial/next-tutorial.txt
 
-pdfdoc: 
-	(cd $(src_doc_dir); prince --javascript --script=prince.js --style=nx-small.css next-migration.html next-migration.pdf)
-	(cd $(src_doc_dir)/next-tutorial; prince --javascript --script=../prince.js --style=../nx.css next-tutorial.html next-tutorial.pdf)
+pdfdoc:
+	(cd $(src_doc_dir); prince --javascript --style=nx-small.css next-migration.html -o next-migration.pdf)
+	(cd $(src_doc_dir)/next-tutorial; prince --javascript --style=../nx.css next-tutorial.html -o next-tutorial.pdf)
 
 example-doc: $(EXAMPLE_SCRIPTS)
 
@@ -526,14 +538,16 @@
 gdb:
 	$(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
 
+lldbtest:
+	$(MAKE) "TCLSH_PROG=lldb -b -o run -- $(TCLSH_PROG)" test
+
 test: binaries libraries test-core test-xotcl test-http @test_actiweb@
 	@if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \
 	for dir in $$dirs ; do \
 	   if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \
 	done; fi
 	$(TCLSH) $(src_test_dir_native)/summary.tcl -title NX+XOTcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
-
 test-nohttp: binaries libraries test-core test-xotcl
 
 TESTLOG   = ./__test.log
@@ -542,7 +556,7 @@
 test-summary:
 	$(TCLSH) $(src_test_dir_native)/summary.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
-test-core: $(TCLSH_PROG)
+test-core:
 	rm -f $(TESTLOG)
 	$(TCLSH) $(src_test_dir_native)/object-system.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(src_test_dir_native)/destroy.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
@@ -598,16 +612,16 @@
 	$(TCLSH) $(src_doc_dir_native)/example-scripts/rosetta-multiple-inheritance.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(src_doc_dir_native)/example-scripts/rosetta-single-inheritance.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
-test-xotcl: $(TCLSH_PROG)
+test-xotcl:
 	$(TCLSH) $(xotcl_src_test_dir)/testo.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(xotcl_src_test_dir)/speedtest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(xotcl_src_test_dir)/testx.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(xotcl_src_test_dir)/slottest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
-test-http: $(TCLSH_PROG)
+test-http:
 	$(TCLSH) $(xotcl_src_test_dir)/xocomm.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
-test-actiweb: $(TCLSH_PROG)
+test-actiweb:
 	$(TCLSH) $(xotcl_src_test_dir)/actiweb.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(xotcl_src_test_dir)/persistence.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	$(TCLSH) $(xotcl_src_test_dir)/UNIVERSAL.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
@@ -945,9 +959,9 @@
 	)
 
 tar:  libraries-pkgindex
+	echo @NSF_COMMIT@ > COMMIT
 	sh $(srcdir)/tclconfig/mktar.sh
 
-
 .PHONY: all binaries clean depend distclean doc install libraries \
 	test test-core test-actiweb