Привёл название утилит к общему виду uniset-xxx

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.0
-Release: alt12
+Release: alt13
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -146,9 +146,9 @@ rm -f %buildroot%_libdir/*.la
 %_bindir/%oname-iocalibr
 %_bindir/%oname-logicproc
 %_bindir/%oname-plogicproc
-%_bindir/mtr-conv
-%_bindir/mtr-setup
-%_bindir/vtconv
+%_bindir/%oname-mtr-conv
+%_bindir/%oname-mtr-setup
+%_bindir/%oname-vtconv
 %_bindir/%oname-rtu188-state
 %_bindir/%oname-rtuexchange
 %_bindir/%oname-smemory
@@ -191,6 +191,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Thu Mar 24 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt13
+- rename some utilities (mtr-xxx --> uniset-mtr-xxx, vtconv --> uniset-vtconv)
+
 * Wed Mar 23 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt12
 - fixed bug in TableBlockStorage interface
 

extensions/RTUExchange/Makefile.am

-bin_PROGRAMS 			= @PACKAGE@-rtuexchange mtr-conv uniset-rtu188-state vtconv mtr-setup
+bin_PROGRAMS 			= @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup
 
 # не забывайте править версию в pc-файле
 URTU_VER=2:0:0
@@ -19,21 +19,21 @@ libUniSetRTU_la_SOURCES 	= RTUStorage.cc RTUExchange.cc
 									$(SIGC_LIBS)
 @PACKAGE@_rtuexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 
-mtr_conv_SOURCES	= mtrconv.cc
-mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-mtr_conv_CXXFLAGS = -I$(top_builddir)/extensions/include
+@PACKAGE@_mtr_conv_SOURCES	= mtrconv.cc
+@PACKAGE@_mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_conv_CXXFLAGS = -I$(top_builddir)/extensions/include
 
-mtr_setup_SOURCES	= mtr-setup.cc
-mtr_setup_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-mtr_setup_CXXFLAGS = -I$(top_builddir)/extensions/include
+@PACKAGE@_mtr_setup_SOURCES	= mtr-setup.cc
+@PACKAGE@_mtr_setup_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_setup_CXXFLAGS = -I$(top_builddir)/extensions/include
 
-vtconv_SOURCES	= vtconv.cc
-vtconv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
+@PACKAGE@_vtconv_SOURCES	= vtconv.cc
+@PACKAGE@_vtconv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
 
-uniset_rtu188_state_LDADD 		= libUniSetRTU.la $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-uniset_rtu188_state__CXXFLAGS	= -I$(top_builddir)/extensions/include
-uniset_rtu188_state_SOURCES		= rtustate.cc
+@PACKAGE@_rtu188_state_LDADD 		= libUniSetRTU.la $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_rtu188_state__CXXFLAGS	= -I$(top_builddir)/extensions/include
+@PACKAGE@_rtu188_state_SOURCES		= rtustate.cc
 
 # install
 devel_include_HEADERS = *.h

extensions/RTUExchange/vtconv.cc

@@ -14,7 +14,7 @@ static void print_help()
 // --------------------------------------------------------------------------
 int main( int argc, const char **argv )
 {   
-
+/*
 	VTypes::F2 f2;
 	f2.raw.val = 2.345;
 	
@@ -58,8 +58,7 @@ int main( int argc, const char **argv )
 	cout << "-------------" << endl << endl;
 
 //	return 0;
-
-
+*/
 	unsigned short v[4];
 	memset(v,0,sizeof(v));