Skip to content

U
uniset2
Commit 41051788 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

global rename extentions to extensions

parent 8264b8c9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 314 deletions
Makefile.am
View file @ 41051788
......@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS=IDL src lib include Utilities extentions docs
SUBDIRS=IDL src lib include Utilities extensions docs
include $(top_builddir)/conf/common.mk
......
Makefile.in
View file @ 41051788
......@@ -265,7 +265,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = IDL src lib include Utilities extentions docs
SUBDIRS = IDL src lib include Utilities extensions docs
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSet.pc
all: config.h
......
conf/libuniset.spec
View file @ 41051788
......@@ -52,21 +52,21 @@ Requires: lib%name = %version-%release
%description doc
Documentations for developing with UniSet
%package extentions
%package extensions
Group: Development/Databases
Summary: libUniSet extentions
Summary: libUniSet extensions
Requires: %name = %version-%release
%description extentions
Extentions for libuniset
%description extensions
Extensions for libuniset
%package extentions-devel
%package extensions-devel
Group: Development/Databases
Summary: Libraries needed to develop for uniset extentions
Requires: %name-extentions = %version-%release
Summary: Libraries needed to develop for uniset extensions
Requires: %name-extensions = %version-%release
%description extentions-devel
Libraries needed to develop for uniset extentions
%description extensions-devel
Libraries needed to develop for uniset extensions
%prep
%setup -q
......@@ -119,7 +119,7 @@ Libraries needed to develop for uniset extentions
%_docdir/%name
%endif
%files extentions
%files extensions
%_bindir/%name-iocontrol
%_bindir/%name-iotest
%_bindir/%name-iocalibr
......@@ -132,22 +132,22 @@ Libraries needed to develop for uniset extentions
%_bindir/%name-smemory
%_bindir/%name-smviewer
%_libdir/*Extentions.so.*
%_libdir/*Extensions.so.*
%_libdir/libUniSetIO*.so.*
%_libdir/libUniSetLP*.so.*
%_libdir/libUniSetMB*.so.*
%_libdir/libUniSetRT*.so.*
%_libdir/libUniSetShared*.so.*
%files extentions-devel
%_includedir/%name/extentions/
%_libdir/*Extentions.so
%files extensions-devel
%_includedir/%name/extensions/
%_libdir/*Extensions.so
%_libdir/libUniSetIO*.so
%_libdir/libUniSetLP*.so
%_libdir/libUniSetMB*.so
%_libdir/libUniSetRT*.so
%_libdir/libUniSetShared*.so
%_pkgconfigdir/*Extentions.pc
%_pkgconfigdir/*Extensions.pc
%_pkgconfigdir/libUniSetIO*.pc
%_pkgconfigdir/libUniSetLog*.pc
%_pkgconfigdir/libUniSetMB*.pc
......@@ -221,7 +221,7 @@ Libraries needed to develop for uniset extentions
- new version
* Tue Dec 16 2008 Pavel Vainerman <pv@altlinux.ru> 0.96-alt1
- new version (+extentions)
- new version (+extensions)
* Tue Nov 27 2007 Pavel Vainerman <pv@altlinux.ru> 0.93-alt13
- new version
......
configure
View file @ 41051788
......@@ -936,7 +936,7 @@ enable_fast_install
with_gnu_ld
enable_libtool_lock
enable_mysql
enable_extentions
enable_extensions
enable_docs
'
ac_precious_vars='build_alias
......@@ -1603,7 +1603,7 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-mysql disable MySQL support
--disable-extentions disable build uniset extentions
--disable-extensions disable build uniset extensions
--disable-docs disable build docs
Optional Packages:
......@@ -16609,13 +16609,13 @@ else
fi
#check build extentions
#check build extensions
ext=true
{ $as_echo "$as_me:$LINENO: checking Extentions" >&5
$as_echo_n "checking Extentions... " >&6; }
# Check whether --enable-extentions was given.
if test "${enable_extentions+set}" = set; then
enableval=$enable_extentions; if test $enableval = yes; then ext=true; else ext=false; fi
{ $as_echo "$as_me:$LINENO: checking Extensions" >&5
$as_echo_n "checking Extensions... " >&6; }
# Check whether --enable-extensions was given.
if test "${enable_extensions+set}" = set; then
enableval=$enable_extensions; if test $enableval = yes; then ext=true; else ext=false; fi
else
ext=true;
fi
......@@ -18579,7 +18579,7 @@ fi
done
ac_config_files="$ac_config_files Makefile libUniSet.pc lib/Makefile IDL/Makefile IDL/UniSetTypes/Makefile IDL/Processes/Makefile IDL/Services/Makefile src/Communications/Makefile src/Communications/Modbus/Makefile src/IOs/Makefile src/Interfaces/Makefile src/ObjectRepository/Makefile src/Processes/Makefile src/Services/Makefile src/Threads/Makefile src/Timers/Makefile src/Various/Makefile src/Makefile include/Makefile include/modbus/Makefile include/IOs/Makefile docs/Makefile docs/UniSetDox.cfg docs/UniSetDoxDevel.cfg Utilities/Makefile Utilities/scripts/Makefile Utilities/Admin/Makefile Utilities/NullController/Makefile Utilities/SViewer-text/Makefile Utilities/SMonit/Makefile Utilities/InfoServer/Makefile Utilities/MBTester/Makefile Utilities/DBServer-MySQL/Makefile Utilities/codegen/Makefile Utilities/codegen/uniset-codegen Utilities/codegen/tests/Makefile extentions/Makefile extentions/libUniSetExtentions.pc extentions/lib/Makefile extentions/include/Makefile extentions/IOControl/Makefile extentions/IOControl/libUniSetIOControl.pc extentions/RTUExchange/Makefile extentions/RTUExchange/libUniSetRTU.pc extentions/UDPExchange/Makefile extentions/UDPExchange/libUniSetUDP.pc extentions/ModbusSlave/Makefile extentions/ModbusSlave/libUniSetMBSlave.pc extentions/MBTCPMaster/Makefile extentions/MBTCPMaster/libUniSetMBTCPMaster.pc extentions/LogicProcessor/Makefile extentions/LogicProcessor/libUniSetLogicProcessor.pc extentions/SMViewer/Makefile extentions/SharedMemory/Makefile extentions/SharedMemory/libUniSetSharedMemory.pc extentions/SharedMemoryPlus/Makefile"
ac_config_files="$ac_config_files Makefile libUniSet.pc lib/Makefile IDL/Makefile IDL/UniSetTypes/Makefile IDL/Processes/Makefile IDL/Services/Makefile src/Communications/Makefile src/Communications/Modbus/Makefile src/IOs/Makefile src/Interfaces/Makefile src/ObjectRepository/Makefile src/Processes/Makefile src/Services/Makefile src/Threads/Makefile src/Timers/Makefile src/Various/Makefile src/Makefile include/Makefile include/modbus/Makefile include/IOs/Makefile docs/Makefile docs/UniSetDox.cfg docs/UniSetDoxDevel.cfg Utilities/Makefile Utilities/scripts/Makefile Utilities/Admin/Makefile Utilities/NullController/Makefile Utilities/SViewer-text/Makefile Utilities/SMonit/Makefile Utilities/InfoServer/Makefile Utilities/MBTester/Makefile Utilities/DBServer-MySQL/Makefile Utilities/codegen/Makefile Utilities/codegen/uniset-codegen Utilities/codegen/tests/Makefile extensions/Makefile extensions/libUniSetExtensions.pc extensions/lib/Makefile extensions/include/Makefile extensions/IOControl/Makefile extensions/IOControl/libUniSetIOControl.pc extensions/RTUExchange/Makefile extensions/RTUExchange/libUniSetRTU.pc extensions/UDPExchange/Makefile extensions/UDPExchange/libUniSetUDP.pc extensions/ModbusSlave/Makefile extensions/ModbusSlave/libUniSetMBSlave.pc extensions/MBTCPMaster/Makefile extensions/MBTCPMaster/libUniSetMBTCPMaster.pc extensions/LogicProcessor/Makefile extensions/LogicProcessor/libUniSetLogicProcessor.pc extensions/SMViewer/Makefile extensions/SharedMemory/Makefile extensions/SharedMemory/libUniSetSharedMemory.pc extensions/SharedMemoryPlus/Makefile"
cat >confcache <<\_ACEOF
......@@ -19641,26 +19641,26 @@ do
"Utilities/codegen/Makefile") CONFIG_FILES="$CONFIG_FILES Utilities/codegen/Makefile" ;;
"Utilities/codegen/uniset-codegen") CONFIG_FILES="$CONFIG_FILES Utilities/codegen/uniset-codegen" ;;
"Utilities/codegen/tests/Makefile") CONFIG_FILES="$CONFIG_FILES Utilities/codegen/tests/Makefile" ;;
"extentions/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/Makefile" ;;
"extentions/libUniSetExtentions.pc") CONFIG_FILES="$CONFIG_FILES extentions/libUniSetExtentions.pc" ;;
"extentions/lib/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/lib/Makefile" ;;
"extentions/include/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/include/Makefile" ;;
"extentions/IOControl/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/IOControl/Makefile" ;;
"extentions/IOControl/libUniSetIOControl.pc") CONFIG_FILES="$CONFIG_FILES extentions/IOControl/libUniSetIOControl.pc" ;;
"extentions/RTUExchange/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/RTUExchange/Makefile" ;;
"extentions/RTUExchange/libUniSetRTU.pc") CONFIG_FILES="$CONFIG_FILES extentions/RTUExchange/libUniSetRTU.pc" ;;
"extentions/UDPExchange/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/UDPExchange/Makefile" ;;
"extentions/UDPExchange/libUniSetUDP.pc") CONFIG_FILES="$CONFIG_FILES extentions/UDPExchange/libUniSetUDP.pc" ;;
"extentions/ModbusSlave/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/ModbusSlave/Makefile" ;;
"extentions/ModbusSlave/libUniSetMBSlave.pc") CONFIG_FILES="$CONFIG_FILES extentions/ModbusSlave/libUniSetMBSlave.pc" ;;
"extentions/MBTCPMaster/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/MBTCPMaster/Makefile" ;;
"extentions/MBTCPMaster/libUniSetMBTCPMaster.pc") CONFIG_FILES="$CONFIG_FILES extentions/MBTCPMaster/libUniSetMBTCPMaster.pc" ;;
"extentions/LogicProcessor/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/LogicProcessor/Makefile" ;;
"extentions/LogicProcessor/libUniSetLogicProcessor.pc") CONFIG_FILES="$CONFIG_FILES extentions/LogicProcessor/libUniSetLogicProcessor.pc" ;;
"extentions/SMViewer/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/SMViewer/Makefile" ;;
"extentions/SharedMemory/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/SharedMemory/Makefile" ;;
"extentions/SharedMemory/libUniSetSharedMemory.pc") CONFIG_FILES="$CONFIG_FILES extentions/SharedMemory/libUniSetSharedMemory.pc" ;;
"extentions/SharedMemoryPlus/Makefile") CONFIG_FILES="$CONFIG_FILES extentions/SharedMemoryPlus/Makefile" ;;
"extensions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Makefile" ;;
"extensions/libUniSetExtensions.pc") CONFIG_FILES="$CONFIG_FILES extensions/libUniSetExtensions.pc" ;;
"extensions/lib/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/lib/Makefile" ;;
"extensions/include/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/include/Makefile" ;;
"extensions/IOControl/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/IOControl/Makefile" ;;
"extensions/IOControl/libUniSetIOControl.pc") CONFIG_FILES="$CONFIG_FILES extensions/IOControl/libUniSetIOControl.pc" ;;
"extensions/RTUExchange/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/RTUExchange/Makefile" ;;
"extensions/RTUExchange/libUniSetRTU.pc") CONFIG_FILES="$CONFIG_FILES extensions/RTUExchange/libUniSetRTU.pc" ;;
"extensions/UDPExchange/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/UDPExchange/Makefile" ;;
"extensions/UDPExchange/libUniSetUDP.pc") CONFIG_FILES="$CONFIG_FILES extensions/UDPExchange/libUniSetUDP.pc" ;;
"extensions/ModbusSlave/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/ModbusSlave/Makefile" ;;
"extensions/ModbusSlave/libUniSetMBSlave.pc") CONFIG_FILES="$CONFIG_FILES extensions/ModbusSlave/libUniSetMBSlave.pc" ;;
"extensions/MBTCPMaster/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/MBTCPMaster/Makefile" ;;
"extensions/MBTCPMaster/libUniSetMBTCPMaster.pc") CONFIG_FILES="$CONFIG_FILES extensions/MBTCPMaster/libUniSetMBTCPMaster.pc" ;;
"extensions/LogicProcessor/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/LogicProcessor/Makefile" ;;
"extensions/LogicProcessor/libUniSetLogicProcessor.pc") CONFIG_FILES="$CONFIG_FILES extensions/LogicProcessor/libUniSetLogicProcessor.pc" ;;
"extensions/SMViewer/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/SMViewer/Makefile" ;;
"extensions/SharedMemory/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/SharedMemory/Makefile" ;;
"extensions/SharedMemory/libUniSetSharedMemory.pc") CONFIG_FILES="$CONFIG_FILES extensions/SharedMemory/libUniSetSharedMemory.pc" ;;
"extensions/SharedMemoryPlus/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/SharedMemoryPlus/Makefile" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
......
configure.ac
View file @ 41051788
......@@ -77,10 +77,10 @@ fi
AM_CONDITIONAL(DISABLE_MYSQL, test ${dmysql} = true)
#check build extentions
#check build extensions
ext=true
AC_MSG_CHECKING([Extentions])
AC_ARG_ENABLE(extentions,AC_HELP_STRING([--disable-extentions], [disable build uniset extentions]),
AC_MSG_CHECKING([Extensions])
AC_ARG_ENABLE(extensions,AC_HELP_STRING([--disable-extensions], [disable build uniset extensions]),
[ if test $enableval = yes; then ext=true; else ext=false; fi],[ ext=true; ])
if test ${ext} = true; then
......@@ -177,25 +177,25 @@ AC_CONFIG_FILES([Makefile
Utilities/codegen/Makefile
Utilities/codegen/uniset-codegen
Utilities/codegen/tests/Makefile
extentions/Makefile
extentions/libUniSetExtentions.pc
extentions/lib/Makefile
extentions/include/Makefile
extentions/IOControl/Makefile
extentions/IOControl/libUniSetIOControl.pc
extentions/RTUExchange/Makefile
extentions/RTUExchange/libUniSetRTU.pc
extentions/UDPExchange/Makefile
extentions/UDPExchange/libUniSetUDP.pc
extentions/ModbusSlave/Makefile
extentions/ModbusSlave/libUniSetMBSlave.pc
extentions/MBTCPMaster/Makefile
extentions/MBTCPMaster/libUniSetMBTCPMaster.pc
extentions/LogicProcessor/Makefile
extentions/LogicProcessor/libUniSetLogicProcessor.pc
extentions/SMViewer/Makefile
extentions/SharedMemory/Makefile
extentions/SharedMemory/libUniSetSharedMemory.pc
extentions/SharedMemoryPlus/Makefile])
extensions/Makefile
extensions/libUniSetExtensions.pc
extensions/lib/Makefile
extensions/include/Makefile
extensions/IOControl/Makefile
extensions/IOControl/libUniSetIOControl.pc
extensions/RTUExchange/Makefile
extensions/RTUExchange/libUniSetRTU.pc
extensions/UDPExchange/Makefile
extensions/UDPExchange/libUniSetUDP.pc
extensions/ModbusSlave/Makefile
extensions/ModbusSlave/libUniSetMBSlave.pc
extensions/MBTCPMaster/Makefile
extensions/MBTCPMaster/libUniSetMBTCPMaster.pc
extensions/LogicProcessor/Makefile
extensions/LogicProcessor/libUniSetLogicProcessor.pc
extensions/SMViewer/Makefile
extensions/SharedMemory/Makefile
extensions/SharedMemory/libUniSetSharedMemory.pc
extensions/SharedMemoryPlus/Makefile])
AC_OUTPUT
extentions/IOControl/IOControl.cc → extensions/IOControl/IOControl.cc
View file @ 41051788
......@@ -3,12 +3,12 @@
#include <sstream>
#include "ORepHelpers.h"
#include "UniSetTypes.h"
#include "Extentions.h"
#include "Extensions.h"
#include "IOControl.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
std::ostream& operator<<( std::ostream& os, IOControl::IOInfo& inf )
{
......
extentions/IOControl/Makefile.am → extensions/IOControl/Makefile.am
View file @ 41051788
......@@ -2,20 +2,20 @@ bin_PROGRAMS = @PACKAGE@-iocontrol @PACKAGE@-iotest @PACKAGE@-iocalibr
lib_LTLIBRARIES = libUniSetIOControl.la
libUniSetIOControl_la_LIBADD = $(COMEDI_LIBS) $(SIGC_LIBS) \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
libUniSetIOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
-I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory
-I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory
libUniSetIOControl_la_SOURCES = ComediInterface.cc IOControl.cc
@PACKAGE@_iocontrol_LDADD = libUniSetIOControl.la $(COMEDI_LIBS)
@PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
-I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory
-I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory
@PACKAGE@_iocontrol_SOURCES = iocontrol.cc
@PACKAGE@_iotest_CXXFLAGS = $(COMEDI_CFLAGS)
......@@ -25,12 +25,12 @@ libUniSetIOControl_la_SOURCES = ComediInterface.cc IOControl.cc
@PACKAGE@_iocalibr_CXXFLAGS = $(COMEDI_CFLAGS)
@PACKAGE@_iocalibr_LDADD = $(COMEDI_LIBS) \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
@PACKAGE@_iocalibr_SOURCES = iocalibr.cc
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetIOControl.pc
extentions/IOControl/Makefile.in → extensions/IOControl/Makefile.in
View file @ 41051788
......@@ -39,7 +39,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-iocontrol$(EXEEXT) @PACKAGE@-iotest$(EXEEXT) \
@PACKAGE@-iocalibr$(EXEEXT)
subdir = extentions/IOControl
subdir = extensions/IOControl
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetIOControl.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -80,9 +80,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetIOControl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
am_libUniSetIOControl_la_OBJECTS = \
libUniSetIOControl_la-ComediInterface.lo \
libUniSetIOControl_la-IOControl.lo
......@@ -96,7 +96,7 @@ am_@PACKAGE@_iocalibr_OBJECTS = @PACKAGE@_iocalibr-iocalibr.$(OBJEXT)
@PACKAGE@_iocalibr_OBJECTS = $(am_@PACKAGE@_iocalibr_OBJECTS)
@PACKAGE@_iocalibr_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
@PACKAGE@_iocalibr_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(@PACKAGE@_iocalibr_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
......@@ -274,19 +274,19 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetIOControl.la
libUniSetIOControl_la_LIBADD = $(COMEDI_LIBS) $(SIGC_LIBS) \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
libUniSetIOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
-I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory
-I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory
libUniSetIOControl_la_SOURCES = ComediInterface.cc IOControl.cc
@PACKAGE@_iocontrol_LDADD = libUniSetIOControl.la $(COMEDI_LIBS)
@PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
-I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory
-I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory
@PACKAGE@_iocontrol_SOURCES = iocontrol.cc
@PACKAGE@_iotest_CXXFLAGS = $(COMEDI_CFLAGS)
......@@ -295,13 +295,13 @@ libUniSetIOControl_la_SOURCES = ComediInterface.cc IOControl.cc
@PACKAGE@_iocalibr_CXXFLAGS = $(COMEDI_CFLAGS)
@PACKAGE@_iocalibr_LDADD = $(COMEDI_LIBS) \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
@PACKAGE@_iocalibr_SOURCES = iocalibr.cc
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetIOControl.pc
all: all-am
......@@ -317,9 +317,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/IOControl/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/IOControl/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/IOControl/Makefile
$(AUTOMAKE) --gnu extensions/IOControl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/IOControl/iocontrol.cc → extensions/IOControl/iocontrol.cc
View file @ 41051788
......@@ -5,11 +5,11 @@
#include "ObjectsActivator.h"
#include "Configuration.h"
#include "IOControl.h"
#include "Extentions.h"
#include "Extensions.h"
// --------------------------------------------------------------------------
using namespace UniSetTypes;
using namespace std;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// --------------------------------------------------------------------------
int main(int argc, char **argv)
{
......
extentions/IOControl/libUniSetIOControl.pc.in → extensions/IOControl/libUniSetIOControl.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetIOControl
Description: Support library for UniSetIOControl
Requires: libUniSetExtentions
Requires: libUniSetExtensions
Version: @VERSION@
Libs: -L${libdir} -lUniSetIOControl
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/LogicProcessor/Makefile.am → extensions/LogicProcessor/Makefile.am
View file @ 41051788
lib_LTLIBRARIES = libUniSetLProcessor.la
libUniSetLProcessor_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la $(SIGC_LIBS)
libUniSetLProcessor_la_CXXFLAGS = -I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory \
$(top_builddir)/extensions/lib/libUniSetExtensions.la $(SIGC_LIBS)
libUniSetLProcessor_la_CXXFLAGS = -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory \
$(SIGC_CFLAGS)
libUniSetLProcessor_la_SOURCES = Element.cc TOR.cc TAND.cc TDelay.cc TNOT.cc \
Schema.cc SchemaXML.cc LProcessor.cc PassiveLProcessor.cc
......@@ -12,23 +12,23 @@ bin_PROGRAMS = @PACKAGE@-logicproc @PACKAGE@-plogicproc
@PACKAGE@_logicproc_SOURCES = logicproc.cc
@PACKAGE@_logicproc_LDADD = libUniSetLProcessor.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
@PACKAGE@_logicproc_CXXFLAGS = -I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory \
@PACKAGE@_logicproc_CXXFLAGS = -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory \
$(SIGC_CFLAGS)
@PACKAGE@_plogicproc_SOURCES = plogicproc.cc
@PACKAGE@_plogicproc_LDADD = libUniSetLProcessor.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
@PACKAGE@_plogicproc_CXXFLAGS = -I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory \
@PACKAGE@_plogicproc_CXXFLAGS = -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory \
$(SIGC_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetLogicProcessor.pc
extentions/LogicProcessor/Makefile.in → extensions/LogicProcessor/Makefile.in
View file @ 41051788
......@@ -39,7 +39,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-logicproc$(EXEEXT) \
@PACKAGE@-plogicproc$(EXEEXT)
subdir = extentions/LogicProcessor
subdir = extensions/LogicProcessor
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetLogicProcessor.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -80,7 +80,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetLProcessor_la_DEPENDENCIES = \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
am_libUniSetLProcessor_la_OBJECTS = libUniSetLProcessor_la-Element.lo \
libUniSetLProcessor_la-TOR.lo libUniSetLProcessor_la-TAND.lo \
......@@ -100,7 +100,7 @@ am_@PACKAGE@_logicproc_OBJECTS = \
@PACKAGE@_logicproc-logicproc.$(OBJEXT)
@PACKAGE@_logicproc_OBJECTS = $(am_@PACKAGE@_logicproc_OBJECTS)
@PACKAGE@_logicproc_DEPENDENCIES = libUniSetLProcessor.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la $(am__DEPENDENCIES_1)
@PACKAGE@_logicproc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -110,7 +110,7 @@ am_@PACKAGE@_plogicproc_OBJECTS = \
@PACKAGE@_plogicproc-plogicproc.$(OBJEXT)
@PACKAGE@_plogicproc_OBJECTS = $(am_@PACKAGE@_plogicproc_OBJECTS)
@PACKAGE@_plogicproc_DEPENDENCIES = libUniSetLProcessor.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la $(am__DEPENDENCIES_1)
@PACKAGE@_plogicproc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -271,10 +271,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetLProcessor.la
libUniSetLProcessor_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la $(SIGC_LIBS)
$(top_builddir)/extensions/lib/libUniSetExtensions.la $(SIGC_LIBS)
libUniSetLProcessor_la_CXXFLAGS = -I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory \
libUniSetLProcessor_la_CXXFLAGS = -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory \
$(SIGC_CFLAGS)
libUniSetLProcessor_la_SOURCES = Element.cc TOR.cc TAND.cc TDelay.cc TNOT.cc \
......@@ -282,26 +282,26 @@ Schema.cc SchemaXML.cc LProcessor.cc PassiveLProcessor.cc
@PACKAGE@_logicproc_SOURCES = logicproc.cc
@PACKAGE@_logicproc_LDADD = libUniSetLProcessor.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
@PACKAGE@_logicproc_CXXFLAGS = -I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory \
@PACKAGE@_logicproc_CXXFLAGS = -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory \
$(SIGC_CFLAGS)
@PACKAGE@_plogicproc_SOURCES = plogicproc.cc
@PACKAGE@_plogicproc_LDADD = libUniSetLProcessor.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
@PACKAGE@_plogicproc_CXXFLAGS = -I$(top_builddir)/extentions/include \
-I$(top_builddir)/extentions/SharedMemory \
@PACKAGE@_plogicproc_CXXFLAGS = -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory \
$(SIGC_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetLogicProcessor.pc
all: all-am
......@@ -317,9 +317,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/LogicProcessor/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/LogicProcessor/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/LogicProcessor/Makefile
$(AUTOMAKE) --gnu extensions/LogicProcessor/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/LogicProcessor/PassiveLProcessor.cc → extensions/LogicProcessor/PassiveLProcessor.cc
View file @ 41051788
......@@ -4,7 +4,7 @@
// -------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -------------------------------------------------------------------------
PassiveLProcessor::PassiveLProcessor( std::string lfile, UniSetTypes::ObjectId objId,
UniSetTypes::ObjectId shmID, SharedMemory* ic ):
......
extentions/LogicProcessor/PassiveLProcessor.h → extensions/LogicProcessor/PassiveLProcessor.h
View file @ 41051788
......@@ -4,7 +4,7 @@
#include <map>
#include "UniSetTypes.h"
#include "UniSetObject_LT.h"
#include "Extentions.h"
#include "Extensions.h"
#include "SharedMemory.h"
#include "UniversalInterface.h"
#include "SMInterface.h"
......
extentions/LogicProcessor/libUniSetLogicProcessor.pc.in → extensions/LogicProcessor/libUniSetLogicProcessor.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetLogicProcessor
Description: Support library for UniSetIOControl
Requires: libUniSetExtentions
Requires: libUniSetExtensions
Version: @VERSION@
Libs: -L${libdir} -lUniSetLProcessor
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/LogicProcessor/logicproc.cc → extensions/LogicProcessor/logicproc.cc
View file @ 41051788
#include <iostream>
#include "Configuration.h"
#include "Extentions.h"
#include "Extensions.h"
#include "LProcessor.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
int main(int argc, char **argv)
{
......
extentions/LogicProcessor/plogicproc.cc → extensions/LogicProcessor/plogicproc.cc
View file @ 41051788
#include <iostream>
#include "Configuration.h"
#include "Extentions.h"
#include "Extensions.h"
#include "ObjectsActivator.h"
#include "PassiveLProcessor.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
int main(int argc, char **argv)
{
......
extentions/MBTCPMaster/MBMaster.cc → extensions/MBTCPMaster/MBMaster.cc
View file @ 41051788
......@@ -3,12 +3,12 @@
#include <cmath>
#include <sstream>
#include "Exceptions.h"
#include "Extentions.h"
#include "Extensions.h"
#include "MBMaster.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
using namespace ModbusRTU;
// -----------------------------------------------------------------------------
MBMaster::MBMaster( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId, SharedMemory* ic,
......
extentions/MBTCPMaster/Makefile.am → extensions/MBTCPMaster/Makefile.am
View file @ 41051788
......@@ -2,22 +2,22 @@ bin_PROGRAMS = @PACKAGE@-mbtcpmaster
lib_LTLIBRARIES = libUniSetMBTCPMaster.la
libUniSetMBTCPMaster_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
libUniSetMBTCPMaster_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBTCPMaster_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBTCPMaster_la_SOURCES = MBMaster.cc
@PACKAGE@_mbtcpmaster_SOURCES = main.cc
@PACKAGE@_mbtcpmaster_LDADD = libUniSetMBTCPMaster.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_mbtcpmaster_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
@PACKAGE@_mbtcpmaster_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetMBTCPMaster.pc
extentions/MBTCPMaster/Makefile.in → extensions/MBTCPMaster/Makefile.in
View file @ 41051788
......@@ -38,7 +38,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-mbtcpmaster$(EXEEXT)
subdir = extentions/MBTCPMaster
subdir = extensions/MBTCPMaster
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetMBTCPMaster.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -79,8 +79,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetMBTCPMaster_la_DEPENDENCIES = \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
am_libUniSetMBTCPMaster_la_OBJECTS = \
libUniSetMBTCPMaster_la-MBMaster.lo
......@@ -96,8 +96,8 @@ am_@PACKAGE@_mbtcpmaster_OBJECTS = \
@PACKAGE@_mbtcpmaster_OBJECTS = $(am_@PACKAGE@_mbtcpmaster_OBJECTS)
@PACKAGE@_mbtcpmaster_DEPENDENCIES = libUniSetMBTCPMaster.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
@PACKAGE@_mbtcpmaster_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -258,23 +258,23 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetMBTCPMaster.la
libUniSetMBTCPMaster_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
libUniSetMBTCPMaster_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBTCPMaster_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBTCPMaster_la_SOURCES = MBMaster.cc
@PACKAGE@_mbtcpmaster_SOURCES = main.cc
@PACKAGE@_mbtcpmaster_LDADD = libUniSetMBTCPMaster.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_mbtcpmaster_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
@PACKAGE@_mbtcpmaster_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetMBTCPMaster.pc
all: all-am
......@@ -290,9 +290,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/MBTCPMaster/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/MBTCPMaster/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/MBTCPMaster/Makefile
$(AUTOMAKE) --gnu extensions/MBTCPMaster/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/MBTCPMaster/libUniSetMBTCPMaster.pc.in → extensions/MBTCPMaster/libUniSetMBTCPMaster.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetMBSlave
Description: Support library for UniSetModbusTCPMaster
Requires: libUniSetExtentions libUniSetSharedMemory
Requires: libUniSetExtensions libUniSetSharedMemory
Version: @VERSION@
Libs: -L${libdir} -lUniSetMBTCPMaster
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/MBTCPMaster/main.cc → extensions/MBTCPMaster/main.cc
View file @ 41051788
......@@ -5,11 +5,11 @@
#include "Configuration.h"
#include "Debug.h"
#include "ObjectsActivator.h"
#include "Extentions.h"
#include "Extensions.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
int main( int argc,char** argv )
{
......
extentions/Makefile.am → extensions/Makefile.am
View file @ 41051788
......@@ -9,7 +9,7 @@ SUBDIRS = lib include SharedMemory IOControl RTUExchange LogicProcessor \
#UDPExchange
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetExtentions.pc
pkgconfig_DATA = libUniSetExtensions.pc
else
SUBDIRS =
......
extentions/Makefile.in → extensions/Makefile.in
View file @ 41051788
......@@ -38,9 +38,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = extentions
subdir = extensions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/libUniSetExtentions.pc.in
$(srcdir)/libUniSetExtensions.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
......@@ -50,7 +50,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = libUniSetExtentions.pc
CONFIG_CLEAN_FILES = libUniSetExtensions.pc
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
......@@ -257,7 +257,7 @@ top_srcdir = @top_srcdir@
#SharedMemoryPlus
#UDPExchange
@HAVE_EXTENTIONS_TRUE@pkgconfigdir = $(libdir)/pkgconfig
@HAVE_EXTENTIONS_TRUE@pkgconfig_DATA = libUniSetExtentions.pc
@HAVE_EXTENTIONS_TRUE@pkgconfig_DATA = libUniSetExtensions.pc
all: all-recursive
.SUFFIXES:
......@@ -270,9 +270,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/Makefile
$(AUTOMAKE) --gnu extensions/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......@@ -291,7 +291,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
libUniSetExtentions.pc: $(top_builddir)/config.status $(srcdir)/libUniSetExtentions.pc.in
libUniSetExtensions.pc: $(top_builddir)/config.status $(srcdir)/libUniSetExtensions.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
......
extentions/ModbusSlave/MBSlave.cc → extensions/ModbusSlave/MBSlave.cc
View file @ 41051788
......@@ -3,14 +3,14 @@
#include <cmath>
#include <sstream>
#include "Exceptions.h"
#include "Extentions.h"
#include "Extensions.h"
#include "MBSlave.h"
#include "modbus/ModbusRTUSlaveSlot.h"
#include "modbus/ModbusTCPServerSlot.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
using namespace ModbusRTU;
// -----------------------------------------------------------------------------
MBSlave::MBSlave( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId,
......
extentions/ModbusSlave/Makefile.am → extensions/ModbusSlave/Makefile.am
View file @ 41051788
......@@ -2,22 +2,22 @@ bin_PROGRAMS = @PACKAGE@-mbslave
lib_LTLIBRARIES = libUniSetMBSlave.la
libUniSetMBSlave_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
libUniSetMBSlave_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBSlave_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBSlave_la_SOURCES = MBSlave.cc
@PACKAGE@_mbslave_SOURCES = mbslave.cc
@PACKAGE@_mbslave_LDADD = libUniSetMBSlave.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_mbslave_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
@PACKAGE@_mbslave_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetMBSlave.pc
extentions/ModbusSlave/Makefile.in → extensions/ModbusSlave/Makefile.in
View file @ 41051788
......@@ -38,7 +38,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-mbslave$(EXEEXT)
subdir = extentions/ModbusSlave
subdir = extensions/ModbusSlave
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetMBSlave.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -78,8 +78,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetMBSlave_la_DEPENDENCIES = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
am_libUniSetMBSlave_la_OBJECTS = libUniSetMBSlave_la-MBSlave.lo
libUniSetMBSlave_la_OBJECTS = $(am_libUniSetMBSlave_la_OBJECTS)
......@@ -92,8 +92,8 @@ am_@PACKAGE@_mbslave_OBJECTS = @PACKAGE@_mbslave-mbslave.$(OBJEXT)
@PACKAGE@_mbslave_OBJECTS = $(am_@PACKAGE@_mbslave_OBJECTS)
@PACKAGE@_mbslave_DEPENDENCIES = libUniSetMBSlave.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
@PACKAGE@_mbslave_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -253,23 +253,23 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetMBSlave.la
libUniSetMBSlave_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
libUniSetMBSlave_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBSlave_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
libUniSetMBSlave_la_SOURCES = MBSlave.cc
@PACKAGE@_mbslave_SOURCES = mbslave.cc
@PACKAGE@_mbslave_LDADD = libUniSetMBSlave.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_mbslave_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
@PACKAGE@_mbslave_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetMBSlave.pc
all: all-am
......@@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/ModbusSlave/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/ModbusSlave/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/ModbusSlave/Makefile
$(AUTOMAKE) --gnu extensions/ModbusSlave/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/ModbusSlave/libUniSetMBSlave.pc.in → extensions/ModbusSlave/libUniSetMBSlave.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetMBSlave
Description: Support library for UniSetModbusSlave
Requires: libUniSetExtentions libUniSetSharedMemory
Requires: libUniSetExtensions libUniSetSharedMemory
Version: @VERSION@
Libs: -L${libdir} -lUniSetMBSlave
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/ModbusSlave/mbslave.cc → extensions/ModbusSlave/mbslave.cc
View file @ 41051788
......@@ -8,11 +8,11 @@
#include "Configuration.h"
#include "Debug.h"
#include "ObjectsActivator.h"
#include "Extentions.h"
#include "Extensions.h"
// --------------------------------------------------------------------------
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
using namespace std;
// --------------------------------------------------------------------------
int main(int argc, char **argv)
......
extentions/RTUExchange/Makefile.am → extensions/RTUExchange/Makefile.am
View file @ 41051788
......@@ -2,34 +2,34 @@ bin_PROGRAMS = @PACKAGE@-rtuexchange mtrconv rtustate vtconv
lib_LTLIBRARIES = libUniSetRTU.la
libUniSetRTU_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
libUniSetRTU_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
libUniSetRTU_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
libUniSetRTU_la_SOURCES = RTUStorage.cc RTUExchange.cc
@PACKAGE@_rtuexchange_SOURCES = rtuexchange.cc
@PACKAGE@_rtuexchange_LDADD = libUniSetRTU.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_rtuexchange_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
@PACKAGE@_rtuexchange_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
mtrconv_SOURCES = mtrconv.cc
mtrconv_LDADD = $(top_builddir)/extentions/lib/libUniSetExtentions.la $(top_builddir)/lib/libUniSet.la
mtrconv_CXXFLAGS = -I$(top_builddir)/extentions/include
mtrconv_LDADD = $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
mtrconv_CXXFLAGS = -I$(top_builddir)/extensions/include
vtconv_SOURCES = vtconv.cc
vtconv_LDADD = $(top_builddir)/extentions/lib/libUniSetExtentions.la $(top_builddir)/lib/libUniSet.la
vtconv_CXXFLAGS = -I$(top_builddir)/extentions/include
vtconv_LDADD = $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
rtustate_LDADD = libUniSetRTU.la $(top_builddir)/extentions/lib/libUniSetExtentions.la $(top_builddir)/lib/libUniSet.la
rtustate__CXXFLAGS = -I$(top_builddir)/extentions/include
rtustate_LDADD = libUniSetRTU.la $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
rtustate__CXXFLAGS = -I$(top_builddir)/extensions/include
rtustate_SOURCES = rtustate.cc
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetRTU.pc
extentions/RTUExchange/Makefile.in → extensions/RTUExchange/Makefile.in
View file @ 41051788
......@@ -39,7 +39,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-rtuexchange$(EXEEXT) mtrconv$(EXEEXT) \
rtustate$(EXEEXT) vtconv$(EXEEXT)
subdir = extentions/RTUExchange
subdir = extensions/RTUExchange
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetRTU.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -79,8 +79,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetRTU_la_DEPENDENCIES = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
am_libUniSetRTU_la_OBJECTS = libUniSetRTU_la-RTUStorage.lo \
libUniSetRTU_la-RTUExchange.lo
......@@ -95,8 +95,8 @@ am_@PACKAGE@_rtuexchange_OBJECTS = \
@PACKAGE@_rtuexchange_OBJECTS = $(am_@PACKAGE@_rtuexchange_OBJECTS)
@PACKAGE@_rtuexchange_DEPENDENCIES = libUniSetRTU.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
@PACKAGE@_rtuexchange_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -105,7 +105,7 @@ am_@PACKAGE@_rtuexchange_OBJECTS = \
am_mtrconv_OBJECTS = mtrconv-mtrconv.$(OBJEXT)
mtrconv_OBJECTS = $(am_mtrconv_OBJECTS)
mtrconv_DEPENDENCIES = \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la
mtrconv_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(mtrconv_CXXFLAGS) $(CXXFLAGS) \
......@@ -113,12 +113,12 @@ mtrconv_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
am_rtustate_OBJECTS = rtustate.$(OBJEXT)
rtustate_OBJECTS = $(am_rtustate_OBJECTS)
rtustate_DEPENDENCIES = libUniSetRTU.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la
am_vtconv_OBJECTS = vtconv-vtconv.$(OBJEXT)
vtconv_OBJECTS = $(am_vtconv_OBJECTS)
vtconv_DEPENDENCIES = \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(top_builddir)/lib/libUniSet.la
vtconv_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(vtconv_CXXFLAGS) $(CXXFLAGS) \
......@@ -279,32 +279,32 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetRTU.la
libUniSetRTU_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
libUniSetRTU_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
libUniSetRTU_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
libUniSetRTU_la_SOURCES = RTUStorage.cc RTUExchange.cc
@PACKAGE@_rtuexchange_SOURCES = rtuexchange.cc
@PACKAGE@_rtuexchange_LDADD = libUniSetRTU.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_rtuexchange_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS)
@PACKAGE@_rtuexchange_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
mtrconv_SOURCES = mtrconv.cc
mtrconv_LDADD = $(top_builddir)/extentions/lib/libUniSetExtentions.la $(top_builddir)/lib/libUniSet.la
mtrconv_CXXFLAGS = -I$(top_builddir)/extentions/include
mtrconv_LDADD = $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
mtrconv_CXXFLAGS = -I$(top_builddir)/extensions/include
vtconv_SOURCES = vtconv.cc
vtconv_LDADD = $(top_builddir)/extentions/lib/libUniSetExtentions.la $(top_builddir)/lib/libUniSet.la
vtconv_CXXFLAGS = -I$(top_builddir)/extentions/include
rtustate_LDADD = libUniSetRTU.la $(top_builddir)/extentions/lib/libUniSetExtentions.la $(top_builddir)/lib/libUniSet.la
rtustate__CXXFLAGS = -I$(top_builddir)/extentions/include
vtconv_LDADD = $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
rtustate_LDADD = libUniSetRTU.la $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
rtustate__CXXFLAGS = -I$(top_builddir)/extensions/include
rtustate_SOURCES = rtustate.cc
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetRTU.pc
all: all-am
......@@ -320,9 +320,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/RTUExchange/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/RTUExchange/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/RTUExchange/Makefile
$(AUTOMAKE) --gnu extensions/RTUExchange/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/RTUExchange/RTUExchange.cc → extensions/RTUExchange/RTUExchange.cc
View file @ 41051788
......@@ -2,12 +2,12 @@
#include <cmath>
#include <sstream>
#include "Exceptions.h"
#include "Extentions.h"
#include "Extensions.h"
#include "RTUExchange.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
RTUExchange::RTUExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId, SharedMemory* ic ):
UniSetObject_LT(objId),
......
extentions/RTUExchange/libUniSetRTU.pc.in → extensions/RTUExchange/libUniSetRTU.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetRTU
Description: Support library for UniSetIOControl
Requires: libUniSetExtentions
Requires: libUniSetExtensions
Version: @VERSION@
Libs: -L${libdir} -lUniSetRTU
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/RTUExchange/rtuexchange.cc → extensions/RTUExchange/rtuexchange.cc
View file @ 41051788
......@@ -2,12 +2,12 @@
// -----------------------------------------------------------------------------
#include <sstream>
#include "ObjectsActivator.h"
#include "Extentions.h"
#include "Extensions.h"
#include "RTUExchange.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
int main( int argc,char** argv )
{
......
extentions/SMViewer/Makefile.am → extensions/SMViewer/Makefile.am
View file @ 41051788
bin_PROGRAMS = @PACKAGE@-smviewer
@PACKAGE@_smviewer_LDADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
@PACKAGE@_smviewer_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extentions/include
$(top_builddir)/extensions/lib/libUniSetExtensions.la
@PACKAGE@_smviewer_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_smviewer_SOURCES = SMViewer.cc main.cc
extentions/SMViewer/Makefile.in → extensions/SMViewer/Makefile.in
View file @ 41051788
......@@ -35,7 +35,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-smviewer$(EXEEXT)
subdir = extentions/SMViewer
subdir = extensions/SMViewer
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
......@@ -56,7 +56,7 @@ am_@PACKAGE@_smviewer_OBJECTS = @PACKAGE@_smviewer-SMViewer.$(OBJEXT) \
am__DEPENDENCIES_1 =
@PACKAGE@_smviewer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
......@@ -207,9 +207,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@PACKAGE@_smviewer_LDADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
@PACKAGE@_smviewer_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extentions/include
@PACKAGE@_smviewer_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_smviewer_SOURCES = SMViewer.cc main.cc
all: all-am
......@@ -224,9 +224,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/SMViewer/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/SMViewer/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/SMViewer/Makefile
$(AUTOMAKE) --gnu extensions/SMViewer/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/SMViewer/SMViewer.cc → extensions/SMViewer/SMViewer.cc
View file @ 41051788
/*! $Id*/
//--------------------------------------------------------------------------------
#include "SMViewer.h"
#include "Extentions.h"
#include "Extensions.h"
//--------------------------------------------------------------------------------
using namespace UniSetTypes;
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
//--------------------------------------------------------------------------------
SMViewer::SMViewer( UniSetTypes::ObjectId shmID ):
SViewer(conf->getControllersSection(),true)
......
extentions/SMViewer/main.cc → extensions/SMViewer/main.cc
View file @ 41051788
#include <iostream>
#include "Configuration.h"
#include "SMViewer.h"
#include "Extentions.h"
#include "Extensions.h"
// -----------------------------------------------------------------------------
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
using namespace std;
// -----------------------------------------------------------------------------
int main( int argc, char **argv )
......
extentions/SharedMemory/Makefile.am → extensions/SharedMemory/Makefile.am
View file @ 41051788
......@@ -2,19 +2,19 @@ bin_PROGRAMS = @PACKAGE@-smemory
lib_LTLIBRARIES = libUniSetSharedMemory.la
libUniSetSharedMemory_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
libUniSetSharedMemory_la_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extentions/include
$(top_builddir)/extensions/lib/libUniSetExtensions.la
libUniSetSharedMemory_la_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
libUniSetSharedMemory_la_SOURCES = SharedMemory.cc
@PACKAGE@_smemory_LDADD = libUniSetSharedMemory.la
@PACKAGE@_smemory_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extentions/include
@PACKAGE@_smemory_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_smemory_SOURCES = smemory.cc
include $(top_builddir)/conf/setting.mk
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetSharedMemory.pc
extentions/SharedMemory/Makefile.in → extensions/SharedMemory/Makefile.in
View file @ 41051788
......@@ -38,7 +38,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-smemory$(EXEEXT)
subdir = extentions/SharedMemory
subdir = extensions/SharedMemory
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetSharedMemory.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -79,7 +79,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetSharedMemory_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
am_libUniSetSharedMemory_la_OBJECTS = \
libUniSetSharedMemory_la-SharedMemory.lo
libUniSetSharedMemory_la_OBJECTS = \
......@@ -243,17 +243,17 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetSharedMemory.la
libUniSetSharedMemory_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la
$(top_builddir)/extensions/lib/libUniSetExtensions.la
libUniSetSharedMemory_la_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extentions/include
libUniSetSharedMemory_la_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
libUniSetSharedMemory_la_SOURCES = SharedMemory.cc
@PACKAGE@_smemory_LDADD = libUniSetSharedMemory.la
@PACKAGE@_smemory_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extentions/include
@PACKAGE@_smemory_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_smemory_SOURCES = smemory.cc
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetSharedMemory.pc
all: all-am
......@@ -269,9 +269,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/SharedMemory/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/SharedMemory/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/SharedMemory/Makefile
$(AUTOMAKE) --gnu extensions/SharedMemory/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/SharedMemory/SharedMemory.cc → extensions/SharedMemory/SharedMemory.cc
View file @ 41051788
......@@ -3,11 +3,11 @@
#include "UniXML.h"
#include "NCRestorer.h"
#include "SharedMemory.h"
#include "Extentions.h"
#include "Extensions.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
SharedMemory::SharedMemory( ObjectId id, string datafile ):
IONotifyController_LT(id),
......
extentions/SharedMemory/libUniSetSharedMemory.pc.in → extensions/SharedMemory/libUniSetSharedMemory.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetSharedMemory
Description: Support library for UniSetIOControl
Requires: libUniSetExtentions
Requires: libUniSetExtensions
Version: @VERSION@
Libs: -L${libdir} -lUniSetSharedMemory
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/SharedMemory/smemory.cc → extensions/SharedMemory/smemory.cc
View file @ 41051788
......@@ -5,11 +5,11 @@
#include "Debug.h"
#include "ObjectsActivator.h"
#include "SharedMemory.h"
#include "Extentions.h"
#include "Extensions.h"
// --------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// --------------------------------------------------------------------------
int main(int argc, char **argv)
{
......
extensions/SharedMemoryPlus/Makefile.am 0 → 100644
View file @ 41051788
bin_PROGRAMS = @PACKAGE@-smemory-plus
@PACKAGE@_smemory_plus_LDADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extensions/RTUExchange/libUniSetRTU.la \
$(top_builddir)/extensions/ModbusSlave/libUniSetMBSlave.la \
$(top_builddir)/extensions/IOControl/libUniSetIOControl.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_smemory_plus_CXXFLAGS = -I$(top_builddir)/extensions/CanNetwork \
-I$(top_builddir)/extensions/RTUExchange \
-I$(top_builddir)/extensions/ModbusSlave \
-I$(top_builddir)/extensions/IOControl \
-I$(top_builddir)/extensions/SharedMemory \
-I$(top_builddir)/extensions/include \
$(SIGC_CFLAGS)
@PACKAGE@_smemory_plus_SOURCES = smemory-plus.cc
extentions/SharedMemoryPlus/Makefile.in → extensions/SharedMemoryPlus/Makefile.in
View file @ 41051788
......@@ -35,7 +35,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-smemory-plus$(EXEEXT)
subdir = extentions/SharedMemoryPlus
subdir = extensions/SharedMemoryPlus
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
......@@ -56,11 +56,11 @@ am_@PACKAGE@_smemory_plus_OBJECTS = \
am__DEPENDENCIES_1 =
@PACKAGE@_smemory_plus_DEPENDENCIES = \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/RTUExchange/libUniSetRTU.la \
$(top_builddir)/extentions/ModbusSlave/libUniSetMBSlave.la \
$(top_builddir)/extentions/IOControl/libUniSetIOControl.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/RTUExchange/libUniSetRTU.la \
$(top_builddir)/extensions/ModbusSlave/libUniSetMBSlave.la \
$(top_builddir)/extensions/IOControl/libUniSetIOControl.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1)
@PACKAGE@_smemory_plus_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -216,19 +216,19 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@PACKAGE@_smemory_plus_LDADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/RTUExchange/libUniSetRTU.la \
$(top_builddir)/extentions/ModbusSlave/libUniSetMBSlave.la \
$(top_builddir)/extentions/IOControl/libUniSetIOControl.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/RTUExchange/libUniSetRTU.la \
$(top_builddir)/extensions/ModbusSlave/libUniSetMBSlave.la \
$(top_builddir)/extensions/IOControl/libUniSetIOControl.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS)
@PACKAGE@_smemory_plus_CXXFLAGS = -I$(top_builddir)/extentions/CanNetwork \
-I$(top_builddir)/extentions/RTUExchange \
-I$(top_builddir)/extentions/ModbusSlave \
-I$(top_builddir)/extentions/IOControl \
-I$(top_builddir)/extentions/SharedMemory \
-I$(top_builddir)/extentions/include \
@PACKAGE@_smemory_plus_CXXFLAGS = -I$(top_builddir)/extensions/CanNetwork \
-I$(top_builddir)/extensions/RTUExchange \
-I$(top_builddir)/extensions/ModbusSlave \
-I$(top_builddir)/extensions/IOControl \
-I$(top_builddir)/extensions/SharedMemory \
-I$(top_builddir)/extensions/include \
$(SIGC_CFLAGS)
@PACKAGE@_smemory_plus_SOURCES = smemory-plus.cc
......@@ -245,9 +245,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/SharedMemoryPlus/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/SharedMemoryPlus/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/SharedMemoryPlus/Makefile
$(AUTOMAKE) --gnu extensions/SharedMemoryPlus/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/SharedMemoryPlus/smemory-plus.cc → extensions/SharedMemoryPlus/smemory-plus.cc
View file @ 41051788
......@@ -5,14 +5,14 @@
#include "Debug.h"
#include "ObjectsActivator.h"
#include "SharedMemory.h"
#include "Extentions.h"
#include "Extensions.h"
#include "IOControl.h"
#include "RTUExchange.h"
#include "MBSlave.h"
// --------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// --------------------------------------------------------------------------
static void help_print( int argc, char* argv[] );
// --------------------------------------------------------------------------
......
extentions/UDPExchange/Makefile.am → extensions/UDPExchange/Makefile.am
View file @ 41051788
......@@ -2,23 +2,23 @@ bin_PROGRAMS = @PACKAGE@-udpexchange
lib_LTLIBRARIES = libUniSetUDP.la
libUniSetUDP_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS) $(COMCPP_LIBS)
libUniSetUDP_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
libUniSetUDP_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
libUniSetUDP_la_SOURCES = UDPPacket.cc UDPExchange.cc
@PACKAGE@_udpexchange_SOURCES = udpexchange.cc
@PACKAGE@_udpexchange_LDADD = libUniSetUDP.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS) $(COMCPP_LIBS)
@PACKAGE@_udpexchange_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
@PACKAGE@_udpexchange_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetUDP.pc
extentions/UDPExchange/Makefile.in → extensions/UDPExchange/Makefile.in
View file @ 41051788
......@@ -38,7 +38,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @PACKAGE@-udpexchange$(EXEEXT)
subdir = extentions/UDPExchange
subdir = extensions/UDPExchange
DIST_COMMON = $(devel_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libUniSetUDP.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -78,8 +78,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libUniSetUDP_la_DEPENDENCIES = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libUniSetUDP_la_OBJECTS = libUniSetUDP_la-UDPPacket.lo \
libUniSetUDP_la-UDPExchange.lo
......@@ -94,8 +94,8 @@ am_@PACKAGE@_udpexchange_OBJECTS = \
@PACKAGE@_udpexchange_OBJECTS = $(am_@PACKAGE@_udpexchange_OBJECTS)
@PACKAGE@_udpexchange_DEPENDENCIES = libUniSetUDP.la \
$(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@PACKAGE@_udpexchange_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
......@@ -255,23 +255,23 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libUniSetUDP.la
libUniSetUDP_la_LIBADD = $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS) $(COMCPP_LIBS)
libUniSetUDP_la_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
libUniSetUDP_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
libUniSetUDP_la_SOURCES = UDPPacket.cc UDPExchange.cc
@PACKAGE@_udpexchange_SOURCES = udpexchange.cc
@PACKAGE@_udpexchange_LDADD = libUniSetUDP.la $(top_builddir)/lib/libUniSet.la \
$(top_builddir)/extentions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extentions/lib/libUniSetExtentions.la \
$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
$(top_builddir)/extensions/lib/libUniSetExtensions.la \
$(SIGC_LIBS) $(COMCPP_LIBS)
@PACKAGE@_udpexchange_CXXFLAGS = -I$(top_builddir)/extentions/include -I$(top_builddir)/extentions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
@PACKAGE@_udpexchange_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
# install
devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/extentions
devel_includedir = $(includedir)/@PACKAGE@/extensions
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetUDP.pc
all: all-am
......@@ -287,9 +287,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extentions/UDPExchange/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/UDPExchange/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu extentions/UDPExchange/Makefile
$(AUTOMAKE) --gnu extensions/UDPExchange/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
extentions/UDPExchange/UDPExchange.cc → extensions/UDPExchange/UDPExchange.cc
View file @ 41051788
......@@ -2,12 +2,12 @@
// -----------------------------------------------------------------------------
#include <sstream>
#include "Exceptions.h"
#include "Extentions.h"
#include "Extensions.h"
#include "UDPExchange.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
UDPExchange::UDPExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId, SharedMemory* ic ):
UniSetObject_LT(objId),
......
extentions/UDPExchange/libUniSetUDP.pc.in → extensions/UDPExchange/libUniSetUDP.pc.in
View file @ 41051788
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libUniSetUDP
Description: Support library for UniSetIOControl
Requires: libUniSetExtentions
Requires: libUniSetExtensions
Version: @VERSION@
Libs: -L${libdir} -lUniSetUDP
Cflags: -I${includedir}/uniset/extentions
Cflags: -I${includedir}/uniset/extensions
extentions/UDPExchange/udpexchange.cc → extensions/UDPExchange/udpexchange.cc
View file @ 41051788
......@@ -2,12 +2,12 @@
// -----------------------------------------------------------------------------
#include <sstream>
#include "ObjectsActivator.h"
#include "Extentions.h"
#include "Extensions.h"
#include "UDPExchange.h"
// -----------------------------------------------------------------------------
using namespace std;
using namespace UniSetTypes;
using namespace UniSetExtentions;
using namespace UniSetExtensions;
// -----------------------------------------------------------------------------
int main( int argc,char** argv )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment