Подготовка к сборке uniset2

.gear/rules

-tar: . name=libuniset-@version@
-spec: conf/libuniset.spec
+tar: . name=libuniset2-@version@
+spec: conf/libuniset2.spec

Makefile.am

@@ -6,7 +6,7 @@ FIRSTSUBDIRS=IDL
 SUBDIRS=. src lib include Utilities extensions python docs
 
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSet22.pc
+pkgconfig_DATA 	= libUniSet2.pc
 
 # Hack for fix build order
 all-local:

Utilities/SImitator/Makefile.am

 bin_PROGRAMS = @PACKAGE@-simitator
 @PACKAGE@_simitator_LDADD    = $(top_builddir)/lib/libUniSet2.la
-@PACKAGE@t_simitator_SOURCES = main.cc
+@PACKAGE@_simitator_SOURCES = main.cc

configure.ac

@@ -168,12 +168,12 @@ echo "UNISET_CODEGEN: $UNISET_CODEGEN"
 
 UNISET_CFLAGS="-I \$(top_builddir) -I \$(top_builddir)/include"
 AC_SUBST(UNISET_CFLAGS)
-UNISET_LIBS="\$(top_builddir)/lib/libUniSet.la"
+UNISET_LIBS="\$(top_builddir)/lib/libUniSet2.la"
 AC_SUBST(UNISET_LIBS)
 
 UNISET_EXT_CFLAGS="-I \$(top_builddir)/extensions/include"
 AC_SUBST(UNISET_EXT_CFLAGS)
-UNISET_EXT_LIBS="\$(top_builddir)/extensions/lib/libUniSetExtensions.la"
+UNISET_EXT_LIBS="\$(top_builddir)/extensions/lib/libUniSet2Extensions.la"
 AC_SUBST(UNISET_EXT_LIBS)
 
 # Checks for header files.
@@ -229,7 +229,7 @@ AC_CONFIG_FILES([Makefile
 				 Utilities/MBTester/Makefile
 				 Utilities/SImitator/Makefile
 				 Utilities/codegen/Makefile
-				 Utilities/codegen/uniset-codegen
+				 Utilities/codegen/uniset2-codegen
 				 Utilities/codegen/tests/Makefile
 				 extensions/Makefile
 				 extensions/libUniSet2Extensions.pc

extensions/IOControl/Makefile.am

@@ -4,14 +4,14 @@ bin_PROGRAMS = @PACKAGE@-iocontrol @PACKAGE@-iotest @PACKAGE@-iocalibr
 UIO_VER=@LIBVER@
 
 lib_LTLIBRARIES 	= libUniSet2IOControl.la
-libUniSet2IOControl_la_LDFLAGS  = -version-info $(UIO_VER)
-libUniSet2IOControl_la_LIBADD		= $(COMEDI_LIBS) $(SIGC_LIBS) \
+libUniSet2IOControl_la_LDFLAGS = -version-info $(UIO_VER)
+libUniSet2IOControl_la_LIBADD  = $(COMEDI_LIBS) $(SIGC_LIBS) \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	-lm
 
-libUniSetIOControl2_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
+libUniSet2IOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
 
@@ -29,7 +29,7 @@ libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc
 @PACKAGE@_iotest_LDADD 	= $(COMEDI_LIBS) -lm
 @PACKAGE@_iotest_SOURCES 	= iotest.cc
 
-@PACKAGE@_iocalibr_CXXFLAGS 	= $(COMEDI_CFLAGS)
+@PACKAGE@_iocalibr_CXXFLAGS = $(COMEDI_CFLAGS)
 @PACKAGE@_iocalibr_LDADD 		= $(COMEDI_LIBS) \
 	$(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \

extensions/LogicProcessor/Makefile.am

@@ -4,30 +4,30 @@ ULPROC_VER=@LIBVER@
 lib_LTLIBRARIES 			= libUniSet2LProcessor.la
 libUniSet2LProcessor_la_LDFLAGS  = -version-info $(ULPROC_VER)
 libUniSet2LProcessor_la_LIBADD	= $(top_builddir)/lib/libUniSet2.la \
-							$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(SIGC_LIBS)
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(SIGC_LIBS)
 libUniSet2LProcessor_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
-							-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 libUniSet2LProcessor_la_SOURCES 	= Element.cc TOR.cc TAND.cc TDelay.cc TNOT.cc \
 Schema.cc SchemaXML.cc LProcessor.cc PassiveLProcessor.cc
 
 
 bin_PROGRAMS 		= @PACKAGE@-logicproc @PACKAGE@-plogicproc
 
-@PACKAGE@_logicproc_SOURCES 	= logicproc.cc
-@PACKAGE@_logicproc_LDADD 	= libUniSetLProcessor2.la \
-						$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-						$(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
+@PACKAGE@_logicproc_SOURCES = logicproc.cc
+@PACKAGE@_logicproc_LDADD   = libUniSet2LProcessor.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
+	$(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
 @PACKAGE@_logicproc_CXXFLAGS	= -I$(top_builddir)/extensions/include \
-				-I$(top_builddir)/extensions/SharedMemory \
-				$(SIGC_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory \
+	$(SIGC_CFLAGS)
 
 @PACKAGE@_plogicproc_SOURCES 	= plogicproc.cc
 @PACKAGE@_plogicproc_LDADD 	= libUniSet2LProcessor.la \
-						$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-						$(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
+	$(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
 @PACKAGE@_plogicproc_CXXFLAGS	= -I$(top_builddir)/extensions/include \
-				-I$(top_builddir)/extensions/SharedMemory \
-				$(SIGC_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory \
+	$(SIGC_CFLAGS)
 
 # install
 devel_include_HEADERS = *.h

extensions/ModbusMaster/Makefile.am

@@ -7,7 +7,7 @@ libMBMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)
 libMBMaster_la_SOURCES 	= MBExchange.cc RTUStorage.cc
 
 bin_PROGRAMS 		= @PACKAGE@-mbtcpmaster @PACKAGE@-mbtcpmultimaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup @PACKAGE@-mtr-read
-lib_LTLIBRARIES 	= libUniSetMBTCPMaster2.la libUniSet2RTU.la
+lib_LTLIBRARIES 	= libUniSet2MBTCPMaster.la libUniSet2RTU.la
 
 # -------------------- Mobus TCP -------------------
 # не забывайте править версию в2.pc-файле
@@ -40,20 +40,20 @@ libUniSet2MBTCPMaster_la_SOURCES 	= MBTCPMaster.cc MBTCPMultiMaster.cc
 # не забывайте править версию в2.pc-файле
 URTU_VER=@LIBVER@
 
-libUniSet2RTU.la_LDFLAGS  = -version-info $(URTU_VER)
-libUniSet2RTU.la_LIBADD		= libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-								$(SIGC_LIBS)
-libUniSet2RTU.la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libUniSet2RTU.la_SOURCES 	= RTUExchange.cc
-
-@PACKAGE@_rtuexchange_SOURCES 	= rtuexchange.cc
-@PACKAGE@_rtuexchange_LDADD 	= libUniSet2RTU.la libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-									$(SIGC_LIBS)
-@PACKAGE@_rtuexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSet2RTU_la_LDFLAGS  = -version-info $(URTU_VER)
+libUniSet2RTU_la_LIBADD   = libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
+	                        $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
+	                        $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
+	                        $(SIGC_LIBS)
+libUniSet2RTU_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSet2RTU_la_SOURCES  = RTUExchange.cc
+
+@PACKAGE@_rtuexchange_SOURCES = rtuexchange.cc
+@PACKAGE@_rtuexchange_LDADD   = libUniSet2RTU.la libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
+	                            $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
+	                            $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
+	                            $(SIGC_LIBS)
+@PACKAGE@_rtuexchange_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 
 @PACKAGE@_mtr_conv_SOURCES	= mtr-conv.cc
 @PACKAGE@_mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/lib/libUniSet2.la

extensions/RRDServer/Makefile.am

@@ -31,7 +31,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSet2RRDServer2.pc
+pkgconfig_DATA 	= libUniSet2RRDServer.pc
 
 all-local:
 	ln -sf ../RRDServer/$(devel_include_HEADERS) ../include

extensions/SharedMemory/Makefile.am

@@ -3,13 +3,12 @@ bin_PROGRAMS		= @PACKAGE@-smemory
 # не забывайте править версию в2.pc-файле
 USM_VER=@LIBVER@
 
-
 lib_LTLIBRARIES 	= libUniSet2SharedMemory.la
-libUniSet2SharedMemory.la_LDFLAGS	= -version-info $(USM_VER)
-libUniSet2SharedMemory.la_LIBADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
+libUniSet2SharedMemory_la_LDFLAGS	= -version-info $(USM_VER)
+libUniSet2SharedMemory_la_LIBADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la
-libUniSet2SharedMemory.la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
-libUniSet2SharedMemory.la_SOURCES 	= SharedMemory.cc
+libUniSet2SharedMemory_la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
+libUniSet2SharedMemory_la_SOURCES 	= SharedMemory.cc
 
 
 @PACKAGE@_smemory_LDADD 	= libUniSet2SharedMemory.la $(top_builddir)/lib/libUniSet2.la \

extensions/lib/Makefile.am

@@ -2,8 +2,8 @@
 UEXT_VER=@LIBVER@
 
 lib_LTLIBRARIES 			= libUniSet2Extensions.la
-libUniSet2Extensions.la_LDFLAGS  = -version-info $(UEXT_VER)
-libUniSet2Extensions.la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
-libUniSet2Extensions.la_LIBADD 	= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la
-libUniSet2Extensions.la_SOURCES 	= Extensions.cc SMInterface.cc Calibration.cc SingleProcess.cc \
+libUniSet2Extensions_la_LDFLAGS  = -version-info $(UEXT_VER)
+libUniSet2Extensions_la_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
+libUniSet2Extensions_la_LIBADD   = $(SIGC_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

include/modbus/Makefile.am

-#modbus_include_HEADERS = $(shell ls $(top_srcdir)/$(subdir) | grep .h )
 modbus_include_HEADERS = *.h
-modbus_includedir = $(includedir)/uniset/modbus
+modbus_includedir = $(includedir)/@PACKAGE@/modbus

python/lib/pyUniSet/Makefile.am

 if DISABLE_PYTHON
 else
-python_SCRIPTS = pyUniSet2.py pyUConnector.py pyUModbus.py pyUExceptions.py
+python_SCRIPTS = pyUniSet.py pyUConnector.py pyUModbus.py pyUExceptions.py
 
-pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet2.la
+pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la
 
-_pyUniSet2_la_SOURCES 	= PyUInterface.cc UInterface_wrap.cxx
-_pyUniSet2_la_CXXFLAGS	= $(UNISET_CFLAGS) $(PYTHON_CFLAGS)
-_pyUniSet2_la_LDFLAGS 	= -module -avoid-version
-_pyUniSet2_la_LIBADD 	= $(UNISET_LIBS) $(PYTHON_LIBS)
+_pyUniSet_la_SOURCES 	= PyUInterface.cc UInterface_wrap.cxx
+_pyUniSet_la_CXXFLAGS	= $(UNISET_CFLAGS) $(PYTHON_CFLAGS)
+_pyUniSet_la_LDFLAGS 	= -module -avoid-version
+_pyUniSet_la_LIBADD 	= $(UNISET_LIBS) $(PYTHON_LIBS)
 
 UInterface_wrap.cxx: UInterface.i PyUInterface.h
 	swig -python -c++ -classic UInterface.i