Убрал из Makefile.am следы COMCPP_[LIBS,CFLAGS]

Utilities/MBTester/Makefile.am

@@ -9,22 +9,22 @@ noinst_PROGRAMS 	= mbtcp-test-connection
 @PACKAGE@_mbrtutest_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 
 @PACKAGE@_mbtcptest_SOURCES 	= mbtcptester.cc
-@PACKAGE@_mbtcptest_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-@PACKAGE@_mbtcptest_CPPFLAGS = $(COMCPP_CFLAGS)
+@PACKAGE@_mbtcptest_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+@PACKAGE@_mbtcptest_CPPFLAGS = $(POCO_CFLAGS)
 
 @PACKAGE@_mbrtuslave_echo_SOURCES 	= MBSlave.cc mbrtuslave.cc
 @PACKAGE@_mbrtuslave_echo_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
 @PACKAGE@_mbrtuslave_echo_CPPFLAGS	= $(SIGC_CFLAGS)
 
 @PACKAGE@_mbtcpserver_echo_SOURCES 	= MBTCPServer.cc mbtcpserver.cc
-@PACKAGE@_mbtcpserver_echo_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
-@PACKAGE@_mbtcpserver_echo_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+@PACKAGE@_mbtcpserver_echo_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(POCO_LIBS)
+@PACKAGE@_mbtcpserver_echo_CPPFLAGS	= $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 #@PACKAGE@_mbtest2_SOURCES 	= mbtester2.cc
 #@PACKAGE@_mbtest2_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 
 mbtcp_test_connection_SOURCES 	= mbtcpconnection.cc
-mbtcp_test_connection_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-mbtcp_test_connection_CPPFLAGS = $(COMCPP_CFLAGS)
+mbtcp_test_connection_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+mbtcp_test_connection_CPPFLAGS = $(POCO_CFLAGS)
 
 include $(top_builddir)/include.mk

Utilities/ULog/Makefile.am

@@ -2,20 +2,20 @@ bin_PROGRAMS = @PACKAGE@-log  @PACKAGE@-logserver-wrap @PACKAGE@-log2val
 noinst_PROGRAMS = @PACKAGE@-test-logserver @PACKAGE@-log-stdin
 
 @PACKAGE@_test_logserver_SOURCES = logserver.cc
-@PACKAGE@_test_logserver_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-@PACKAGE@_test_logserver_CPPFLAGS = $(COMCPP_CFLAGS)
+@PACKAGE@_test_logserver_LDADD = $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+@PACKAGE@_test_logserver_CPPFLAGS = $(POCO_CFLAGS)
 
 @PACKAGE@_log_SOURCES = log.cc
-@PACKAGE@_log_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-@PACKAGE@_log_CPPFLAGS = $(COMCPP_CFLAGS)
+@PACKAGE@_log_LDADD = $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+@PACKAGE@_log_CPPFLAGS = $(POCO_CFLAGS)
 
 @PACKAGE@_log_stdin_SOURCES = log-stdin.cc
-@PACKAGE@_log_stdin_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-@PACKAGE@_log_stdin_CPPFLAGS = $(COMCPP_CFLAGS)
+@PACKAGE@_log_stdin_LDADD = $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+@PACKAGE@_log_stdin_CPPFLAGS = $(POCO_CFLAGS)
 
 @PACKAGE@_logserver_wrap_SOURCES = log-wrap.cc
-@PACKAGE@_logserver_wrap_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-@PACKAGE@_logserver_wrap_CPPFLAGS = $(COMCPP_CFLAGS)
+@PACKAGE@_logserver_wrap_LDADD = $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+@PACKAGE@_logserver_wrap_CPPFLAGS = $(POCO_CFLAGS)
 
 @PACKAGE@_log2val_SOURCES = log2val.cc
 @PACKAGE@_log2val_LDADD = $(top_builddir)/lib/libUniSet2.la

Utilities/codegen/tests/Makefile.am

 noinst_PROGRAMS = test test2
 #test2
 
-test_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-test_CXXFLAGS	= -I$(top_builddir)/include $(COMCPP_CGLAGS)
+test_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+test_CXXFLAGS	= -I$(top_builddir)/include $(POCO_CGLAGS)
 test_SOURCES 	= TestGen_SK.cc TestGen.cc TestGen-main.cc
 
-test2_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-test2_CXXFLAGS	= -I$(top_builddir)/include $(COMCPP_CGLAGS)
+test2_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS)
+test2_CXXFLAGS	= -I$(top_builddir)/include $(POCO_CGLAGS)
 test2_SOURCES 	= TestGenAlone_SK.cc TestGenAlone.cc TestGenAlone-main.cc
 
 GENERATED=TestGen_SK.h TestGen_SK.cc TestGen-main.cc

extensions/IOControl/Makefile.am

@@ -6,13 +6,13 @@ UIO_VER=@LIBVER@
 
 lib_LTLIBRARIES 	= libUniSet2IOControl.la
 libUniSet2IOControl_la_LDFLAGS = -version-info $(UIO_VER)
-libUniSet2IOControl_la_LIBADD  = $(COMEDI_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) \
+libUniSet2IOControl_la_LIBADD  = $(COMEDI_LIBS) $(SIGC_LIBS) $(POCO_LIBS) \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	-lm
 
-libUniSet2IOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) $(COMCPP_CFLAGS) \
+libUniSet2IOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) $(POCO_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
 
@@ -22,8 +22,8 @@ libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc
 	$(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(COMEDI_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) -lm
-@PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) $(COMCPP_CFLAGS) \
+	$(COMEDI_LIBS) $(SIGC_LIBS) $(POCO_LIBS) -lm
+@PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) $(POCO_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
 @PACKAGE@_iocontrol_SOURCES = iocontrol.cc

extensions/ModbusMaster/tests/Makefile.am

@@ -6,19 +6,19 @@ run_test_mbtcpmaster_SOURCES   = run_test_mbtcpmaster.cc test_mbtcpmaster.cc MBT
 run_test_mbtcpmaster_LDADD	 = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 run_test_mbtcpmaster_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/ModbusMaster \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 run_test_mbtcpmultimaster_SOURCES   = run_test_mbtcpmultimaster.cc test_mbtcpmultimaster.cc MBTCPTestServer.cc
 run_test_mbtcpmultimaster_LDADD	 = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 run_test_mbtcpmultimaster_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/ModbusMaster \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 include $(top_builddir)/testsuite/testsuite-common.mk
 

extensions/ModbusSlave/Makefile.am

@@ -8,16 +8,16 @@ libUniSet2MBSlave_la_LDFLAGS  = -version-info $(UMBS_VER)
 libUniSet2MBSlave_la_LIBADD		= $(top_builddir)/lib/libUniSet2.la \
 								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-								$(SIGC_LIBS) $(COMCPP_LIBS)
-libUniSet2MBSlave_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+								$(SIGC_LIBS) $(POCO_LIBS)
+libUniSet2MBSlave_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 libUniSet2MBSlave_la_SOURCES 	= MBSlave.cc
 
 @PACKAGE@_mbslave_SOURCES 	= mbslave.cc
 @PACKAGE@_mbslave_LDADD 	= libUniSet2MBSlave.la $(top_builddir)/lib/libUniSet2.la \
 									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-									$(SIGC_LIBS) $(COMCPP_LIBS)
-@PACKAGE@_mbslave_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+									$(SIGC_LIBS) $(POCO_LIBS)
+@PACKAGE@_mbslave_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 # install
 devel_include_HEADERS = *.h

extensions/ModbusSlave/tests/Makefile.am

@@ -6,10 +6,10 @@ tests_with_sm_SOURCES   = tests_with_sm.cc test_mbslave.cc
 tests_with_sm_LDADD	 = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/ModbusSlave \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 #$(top_builddir)/extensions/lib/libUniSet2Extensions.la:
 #	cd $(top_builddir)/extensions/lib/ && make

extensions/SharedMemory/tests/Makefile.am

@@ -10,9 +10,9 @@ TestObject_SK.cc TestObject_SK.h: testobject.src.xml
 tests_SOURCES = TestObject_SK.cc NullSM.cc TestObject.cc test_sm.cc tests.cc
 tests_LDADD	 = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 tests_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 include $(top_builddir)/testsuite/testsuite-common.mk
 

extensions/SharedMemoryPlus/Makefile.am

@@ -16,7 +16,7 @@ bin_PROGRAMS 		= @PACKAGE@-smemory-plus
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(IO_LIBS) \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 
 @PACKAGE@_smemory_plus_CXXFLAGS	= \
 	-I$(top_builddir)/extensions/UNetUDP \
@@ -25,7 +25,7 @@ bin_PROGRAMS 		= @PACKAGE@-smemory-plus
 	-I$(top_builddir)/extensions/SharedMemory \
 	-I$(top_builddir)/extensions/include \
 	$(IO_CFLAGS) \
-	$(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	$(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 @PACKAGE@_smemory_plus_SOURCES = smemory-plus.cc
 

extensions/UNetUDP/Makefile.am

@@ -8,21 +8,21 @@ libUniSet2UNetUDP_la_LDFLAGS  = -version-info $(UNETUDP_VER)
 libUniSet2UNetUDP_la_LIBADD		= $(top_builddir)/lib/libUniSet2.la \
 								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-								$(SIGC_LIBS) $(COMCPP_LIBS)
-libUniSet2UNetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+								$(SIGC_LIBS) $(POCO_LIBS)
+libUniSet2UNetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 libUniSet2UNetUDP_la_SOURCES 	= UDPPacket.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
 
 @PACKAGE@_unetexchange_SOURCES 		= unetexchange.cc
 @PACKAGE@_unetexchange_LDADD 		= libUniSet2UNetUDP.la $(top_builddir)/lib/libUniSet2.la \
 									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-									$(SIGC_LIBS) $(COMCPP_LIBS)
-@PACKAGE@_unetexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+									$(SIGC_LIBS) $(POCO_LIBS)
+@PACKAGE@_unetexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 
 @PACKAGE@_unet_udp_tester_SOURCES	= UDPPacket.cc unet-udp-tester.cc
-@PACKAGE@_unet_udp_tester_LDADD 	= $(COMCPP_LIBS)
-@PACKAGE@_unet_udp_tester_CXXFLAGS	= $(COMCPP_CFLAGS)
+@PACKAGE@_unet_udp_tester_LDADD 	= $(POCO_LIBS)
+@PACKAGE@_unet_udp_tester_CXXFLAGS	= $(POCO_CFLAGS)
 
 # install
 devel_include_HEADERS = *.h

extensions/UNetUDP/tests/Makefile.am

@@ -6,19 +6,19 @@ tests_with_sm_SOURCES   = tests_with_sm.cc test_unetudp.cc
 tests_with_sm_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/UNetUDP/libUniSet2UNetUDP.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/UNetUDP \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(POCO_CFLAGS)
 
 urecv_perf_test_SOURCES   = urecv_perf_test.cc
 urecv_perf_test_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/UNetUDP/libUniSet2UNetUDP.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 urecv_perf_test_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/UNetUDP \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(POCO_CFLAGS)
 
 
 include $(top_builddir)/testsuite/testsuite-common.mk

extensions/UniNetwork/Makefile.am

@@ -8,8 +8,8 @@ libUniSet2Network_la_LDFLAGS  = -version-info $(UNET_VER)
 libUniSet2Network_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(COMCPP_LIBS)
-libUniSet2Network_la_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS)\
+	$(POCO_LIBS)
+libUniSet2Network_la_CPPFLAGS	= $(SIGC_CFLAGS) $(POCO_CFLAGS)\
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
 libUniSet2Network_la_SOURCES = UniExchange.cc
@@ -18,8 +18,8 @@ libUniSet2Network_la_SOURCES = UniExchange.cc
 	$(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(COMCPP_LIBS)
-@PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory
+	$(POCO_LIBS)
+@PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) $(POCO_CFLAGS) -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory
 @PACKAGE@_network_SOURCES 	= uninet.cc
 
 # install

extensions/lib/Makefile.am

@@ -3,8 +3,8 @@ UEXT_VER=@LIBVER@
 
 lib_LTLIBRARIES 			= libUniSet2Extensions.la
 libUniSet2Extensions_la_LDFLAGS  = -version-info $(UEXT_VER)
-libUniSet2Extensions_la_CPPFLAGS = $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/include
-libUniSet2Extensions_la_LIBADD   = $(SIGC_LIBS) $(COMCPP_LIBS) $(top_builddir)/lib/libUniSet2.la
+libUniSet2Extensions_la_CPPFLAGS = $(SIGC_CFLAGS) $(POCO_CFLAGS) -I$(top_builddir)/extensions/include
+libUniSet2Extensions_la_LIBADD   = $(SIGC_LIBS) $(POCO_LIBS) $(top_builddir)/lib/libUniSet2.la
 libUniSet2Extensions_la_SOURCES  = Extensions.cc SMInterface.cc Calibration.cc SingleProcess.cc \
 	IOBase.cc DigitalFilter.cc PID.cc MTR.cc VTypes.cc UObject_SK.cc
 

extensions/tests/MBSlaveTest/Makefile.am

@@ -3,12 +3,12 @@ mbslave_test_LDADD = $(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 mbslave_test_CPPFLAGS = -I$(top_builddir)/include \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory \
 	-I$(top_builddir)/extensions/ModbusSlave \
-	$(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	$(SIGC_CFLAGS) $(POCO_CFLAGS)
 mbslave_test_SOURCES = TestProc_SK.cc TestProc.cc mbslave-test.cc
 
 BUILT_SOURCES=TestProc_SK.cc TestProc_SK.h

extensions/tests/MQPerfTest/Makefile.am

 noinst_PROGRAMS = mq-test
-mq_test_LDADD = $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
-mq_test_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+mq_test_LDADD = $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(POCO_LIBS)
+mq_test_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include $(SIGC_CFLAGS) $(POCO_CFLAGS)
 mq_test_SOURCES = TestProc_SK.cc TestProc.cc mq-test.cc
 
 BUILT_SOURCES=TestProc_SK.cc TestProc_SK.h

extensions/tests/Makefile.am

@@ -13,16 +13,16 @@ tests_with_conf_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensio
 
 tests_with_sm_SOURCES   = tests_with_sm.cc test_ui.cc test_iobase_with_sm.cc
 tests_with_sm_LDADD	 = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(COMCPP_LIBS)
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(POCO_LIBS)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 
 sm_perf_test_SOURCES   = sm_perf_test.cc
 sm_perf_test_LDADD	 = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) -lpthread
 sm_perf_test_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 
 include $(top_builddir)/testsuite/testsuite-common.mk

extensions/tests/SMemoryTest/Makefile.am

@@ -2,11 +2,11 @@ noinst_PROGRAMS = smemory-test
 smemory_test_LDADD = $(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS)
+	$(SIGC_LIBS) $(POCO_LIBS)
 smemory_test_CPPFLAGS = -I$(top_builddir)/include \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory \
-	$(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+	$(SIGC_CFLAGS) $(POCO_CFLAGS)
 smemory_test_SOURCES = TestProc_SK.cc TestProc.cc smemory-test.cc
 
 BUILT_SOURCES=TestProc_SK.cc TestProc_SK.h

python/lib/pyUniSet/Makefile.am

@@ -34,9 +34,9 @@ UConnector_wrap.cxx: UConnector.i UConnector.h
 	swig -python -c++ -classic UConnector.i
 
 _pyUModbus_la_SOURCES 	= UModbus.cc UModbus_wrap.cxx
-_pyUModbus_la_CXXFLAGS	= $(UNISET_CFLAGS) $(UNISET_EXT_CFLAGS) $(COMCPP_CFLAGS) $(PYTHON_CFLAGS) 
+_pyUModbus_la_CXXFLAGS	= $(UNISET_CFLAGS) $(UNISET_EXT_CFLAGS) $(POCO_CFLAGS) $(PYTHON_CFLAGS) 
 _pyUModbus_la_LDFLAGS 	= -module -avoid-version
-_pyUModbus_la_LIBADD 	= $(UNISET_LIBS) $(UNISET_EXT_LIBS) $(COMCPP_LIBS) $(PYTHON_LIBS)
+_pyUModbus_la_LIBADD 	= $(UNISET_LIBS) $(UNISET_EXT_LIBS) $(POCO_LIBS) $(PYTHON_LIBS)
 
 UModbus_wrap.cxx: UInterface.i UModbus.h
 	swig -python -c++ -classic UModbus.i

src/Communications/Modbus/Makefile.am

@@ -7,8 +7,8 @@ libModbus_la_SOURCES	= ModbusTypes.cc ModbusHelpers.cc ModbusTCPSession.cc \
 	ModbusRTUSlave.cc ModbusRTUSlaveSlot.cc ModbusRTUMaster.cc \
 	ModbusTCPCore.cc ModbusTCPServer.cc ModbusTCPServerSlot.cc ModbusTCPMaster.cc
 	
-libModbus_la_CXXFLAGS	= -I$(top_builddir)/include/Communications/modbus $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(EV_CFLAGS)
-#libModbus_la_LIBADD		= $(top_builddir)/src/Communications/TCP/libTCP.la $(SIGC_LIBS) $(COMCPP_LIBS)
-libModbus_la_LIBADD		= $(SIGC_LIBS) $(COMCPP_LIBS) $(EV_LIBS)
+libModbus_la_CXXFLAGS	= -I$(top_builddir)/include/Communications/modbus $(SIGC_CFLAGS) $(POCO_CFLAGS) $(EV_CFLAGS)
+#libModbus_la_LIBADD		= $(top_builddir)/src/Communications/TCP/libTCP.la $(SIGC_LIBS) $(POCO_LIBS)
+libModbus_la_LIBADD		= $(SIGC_LIBS) $(POCO_LIBS) $(EV_LIBS)
 
 include $(top_builddir)/include.mk

src/Communications/TCP/Makefile.am

@@ -4,7 +4,7 @@
 noinst_LTLIBRARIES 	= libTCP.la
 libTCP_la_SOURCES	= UTCPCore.cc UTCPStream.cc USocket.cc UTCPSocket.cc TCPCheck.cc
 	
-libTCP_la_CXXFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-libTCP_la_LIBADD	= $(SIGC_LIBS) $(COMCPP_LIBS)
+libTCP_la_CXXFLAGS	= $(SIGC_CFLAGS) $(POCO_CFLAGS)
+libTCP_la_LIBADD	= $(SIGC_LIBS) $(POCO_LIBS)
 
 include $(top_builddir)/include.mk

src/Log/Makefile.am

@@ -3,8 +3,8 @@
 ############################################################################
 
 noinst_LTLIBRARIES = libLog.la
-libLog_la_CPPFLAGS = $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-libLog_la_LIBADD 	=  $(SIGC_LIBS) $(COMCPP_LIBS)
+libLog_la_CPPFLAGS = $(SIGC_CFLAGS) $(POCO_CFLAGS)
+libLog_la_LIBADD 	=  $(SIGC_LIBS) $(POCO_LIBS)
 libLog_la_SOURCES = DebugStream.cc Debug.cc LogServerTypes.cc LogServer.cc LogSession.cc LogReader.cc LogAgregator.cc
 
 include $(top_builddir)/include.mk

src/Various/Makefile.am

@@ -3,8 +3,8 @@
 ############################################################################
 
 noinst_LTLIBRARIES = libVarious.la
-libVarious_la_CPPFLAGS 	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-libVarious_la_LIBADD 	= $(SIGC_LIBS) $(COMCPP_LIBS)
+libVarious_la_CPPFLAGS 	= $(SIGC_CFLAGS) $(POCO_CFLAGS)
+libVarious_la_LIBADD 	= $(SIGC_LIBS) $(POCO_LIBS)
 libVarious_la_SOURCES 	= UniXML.cc MessageType.cc Configuration.cc MQMutex.cc MQAtomic.cc \
 	Restorer_XML.cc RunLock.cc Mutex.cc SViewer.cc SMonitor.cc LT_Object.cc WDTInterface.cc VMonitor.cc
 

tests/Makefile.am

@@ -26,7 +26,8 @@ test_pulse.cc \
 test_modbustypes.cc \
 test_mutex.cc \
 test_logserver.cc \
-test_tcpcheck.cc
+test_tcpcheck.cc \
+test_utcpsocket.cc
 
 tests_with_conf_LDADD   = $(top_builddir)/lib/libUniSet2.la
 tests_with_conf_CPPFLAGS = -I$(top_builddir)/include
@@ -40,8 +41,8 @@ test_mqueue.cc \
 test_uobject.cc
 
 # threadtst_SOURCES = threadtst.cc
-# threadtst_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS)
-# threadtst_CPPFLAGS	= -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
+# threadtst_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS}
+# threadtst_CPPFLAGS	= -I$(top_builddir)/include ${SIGC_CFLAGS}
 # 
 
 

uniset2.files

@@ -465,6 +465,7 @@ tests/test_logserver.cc
 tests/test_tcpcheck.cc
 tests/test_mqueue.cc
 tests/test_uobject.cc
+tests/test_utcpsocket.cc
 tests/TestUObject.h
 tests/tests-junit.xml
 tests/tests.cc