Skip to content

U
uniset2
Commit d99721a3 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

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

parent 66c8d362
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 32 deletions
.gear/rules
View file @ d99721a3
tar: . name=libuniset-@version@
spec: conf/libuniset.spec
tar: . name=libuniset2-@version@
spec: conf/libuniset2.spec
Makefile.am
View file @ d99721a3
......@@ -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
View file @ d99721a3
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
View file @ d99721a3
......@@ -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
View file @ d99721a3
......@@ -11,7 +11,7 @@ libUniSet2IOControl_la_LIBADD = $(COMEDI_LIBS) $(SIGC_LIBS) \
$(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
......
extensions/LogicProcessor/Makefile.am
View file @ d99721a3
......@@ -14,7 +14,7 @@ Schema.cc SchemaXML.cc LProcessor.cc PassiveLProcessor.cc
bin_PROGRAMS = @PACKAGE@-logicproc @PACKAGE@-plogicproc
@PACKAGE@_logicproc_SOURCES = logicproc.cc
@PACKAGE@_logicproc_LDADD = libUniSetLProcessor2.la \
@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 \
......
extensions/ModbusMaster/Makefile.am
View file @ d99721a3
......@@ -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,13 +40,13 @@ 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 \
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
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 \
......
extensions/RRDServer/Makefile.am
View file @ d99721a3
......@@ -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
View file @ d99721a3
......@@ -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
View file @ d99721a3
......@@ -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
View file @ d99721a3
#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
View file @ d99721a3
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
......
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