Utilities/{XmlTest|JrnTests} --> test/{XmlTest|JrnTests}

Utilities/Makefile.am

@@ -3,7 +3,7 @@
 ############################################################################
 
 UTILS = scripts Admin NullController SViewer-text \
-	InfoServer SMonit MBTester codegen JrnTests SImitator
+	InfoServer SMonit MBTester codegen SImitator
 #MapSourceParser ClassGen
 
 if DISABLE_MYSQL

configure.ac

@@ -153,6 +153,8 @@ AC_CONFIG_FILES([Makefile
 				 include/modbus/Makefile
 				 include/IOs/Makefile
 				 tests/Makefile
+				 tests/JrnTests/Makefile
+				 tests/UniXmlTest/Makefile
 				 docs/Makefile
 				 docs/UniSetDox.cfg
 				 docs/UniSetDoxDevel.cfg
@@ -166,8 +168,6 @@ AC_CONFIG_FILES([Makefile
 				 Utilities/MBTester/Makefile
 				 Utilities/DBServer-MySQL/Makefile
 				 Utilities/SImitator/Makefile
-				 Utilities/JrnTests/Makefile
-				 Utilities/UniXmlTest/Makefile
 				 Utilities/codegen/Makefile
 				 Utilities/codegen/uniset-codegen
 				 Utilities/codegen/tests/Makefile

tests/Makefile.am

@@ -2,6 +2,8 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
 
+SUBDIRS=JrnTests
+
 noinst_PROGRAMS 		= passivetimer unixml ui umutex conftest
 
 passivetimer_SOURCES 	= passivetimer.cc