Commit 35fc6425 authored by Pavel Vainerman's avatar Pavel Vainerman

Исправил warning: 'underlinked libraries'

parent e0626c4d
...@@ -56,7 +56,6 @@ fi ...@@ -56,7 +56,6 @@ fi
AM_CONDITIONAL(DISABLE_SQLITE, test ${buildsqlite} = false) AM_CONDITIONAL(DISABLE_SQLITE, test ${buildsqlite} = false)
# check IDL compiler # check IDL compiler
AC_PATH_PROG([IDL], [omniidl]) AC_PATH_PROG([IDL], [omniidl])
test "x$IDL" = "x" && AC_MSG_ERROR([*** omniidl not found.]) test "x$IDL" = "x" && AC_MSG_ERROR([*** omniidl not found.])
......
if ENABLE_IO
bin_PROGRAMS = @PACKAGE@-iocontrol @PACKAGE@-iotest @PACKAGE@-iocalibr bin_PROGRAMS = @PACKAGE@-iocontrol @PACKAGE@-iotest @PACKAGE@-iocalibr
# не забывайте править версию в2.pc-файле # не забывайте править версию в2.pc-файле
...@@ -5,13 +6,13 @@ UIO_VER=@LIBVER@ ...@@ -5,13 +6,13 @@ UIO_VER=@LIBVER@
lib_LTLIBRARIES = libUniSet2IOControl.la lib_LTLIBRARIES = libUniSet2IOControl.la
libUniSet2IOControl_la_LDFLAGS = -version-info $(UIO_VER) libUniSet2IOControl_la_LDFLAGS = -version-info $(UIO_VER)
libUniSet2IOControl_la_LIBADD = $(COMEDI_LIBS) $(SIGC_LIBS) \ libUniSet2IOControl_la_LIBADD = $(COMEDI_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/lib/libUniSet2.la \ $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-lm -lm
libUniSet2IOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \ libUniSet2IOControl_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) $(COMCPP_CFLAGS) \
-I$(top_builddir)/extensions/include \ -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/SharedMemory
...@@ -19,8 +20,8 @@ libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc ...@@ -19,8 +20,8 @@ libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc
@PACKAGE@_iocontrol_LDADD = libUniSet2IOControl.la \ @PACKAGE@_iocontrol_LDADD = libUniSet2IOControl.la \
$(top_builddir)/lib/libUniSet2.la \ $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(COMEDI_LIBS) -lm $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(COMEDI_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) -lm
@PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \ @PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) $(COMCPP_CFLAGS) \
-I$(top_builddir)/extensions/include \ -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/SharedMemory
@PACKAGE@_iocontrol_SOURCES = iocontrol.cc @PACKAGE@_iocontrol_SOURCES = iocontrol.cc
...@@ -45,3 +46,6 @@ pkgconfig_DATA = libUniSet2IOControl.pc ...@@ -45,3 +46,6 @@ pkgconfig_DATA = libUniSet2IOControl.pc
all-local: all-local:
ln -sf ../IOControl/$(devel_include_HEADERS) ../include ln -sf ../IOControl/$(devel_include_HEADERS) ../include
endif
# end of ENABLE_IO
...@@ -8,23 +8,23 @@ libUniSet2MBSlave_la_LDFLAGS = -version-info $(UMBS_VER) ...@@ -8,23 +8,23 @@ libUniSet2MBSlave_la_LDFLAGS = -version-info $(UMBS_VER)
libUniSet2MBSlave_la_LIBADD = $(top_builddir)/lib/libUniSet2.la \ libUniSet2MBSlave_la_LIBADD = $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(SIGC_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS)
libUniSet2MBSlave_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) libUniSet2MBSlave_la_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
libUniSet2MBSlave_la_SOURCES = MBSlave.cc MBTCPMultiSlave.cc libUniSet2MBSlave_la_SOURCES = MBSlave.cc MBTCPMultiSlave.cc
@PACKAGE@_mbslave_SOURCES = mbslave.cc @PACKAGE@_mbslave_SOURCES = mbslave.cc
@PACKAGE@_mbslave_LDADD = libUniSet2MBSlave.la $(top_builddir)/lib/libUniSet2.la \ @PACKAGE@_mbslave_LDADD = libUniSet2MBSlave.la $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(SIGC_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS)
@PACKAGE@_mbslave_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) @PACKAGE@_mbslave_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
@PACKAGE@_mbtcp_multislave_SOURCES = mbtcp-multislave.cc @PACKAGE@_mbtcp_multislave_SOURCES = mbtcp-multislave.cc
@PACKAGE@_mbtcp_multislave_LDADD = libUniSet2MBSlave.la $(top_builddir)/lib/libUniSet2.la \ @PACKAGE@_mbtcp_multislave_LDADD = libUniSet2MBSlave.la $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(SIGC_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS)
@PACKAGE@_mbtcp_multislave_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) @PACKAGE@_mbtcp_multislave_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
......
...@@ -4,8 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs" ...@@ -4,8 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs"
ulimit -Sc 10000000000 ulimit -Sc 10000000000
./uniset2-start.sh -f ./uniset2-smemory --smemory-id SharedMemory --pulsar-id DO_C --pulsar-iotype DO \ ./uniset2-start.sh -f ./uniset2-smemory --smemory-id SharedMemory --pulsar-id DO_C --pulsar-iotype DO --pulsar-msec 100 \
--confile test.xml --datfile test.xml \ --confile test.xml --datfile test.xml --db-logging 1 \
--ulog-add-levels info,crit,warn,level9,system \ #--ulog-add-levels info,crit,warn,level9,system \
--dlog-add-levels info,crit,warn \ #--dlog-add-levels info,crit,warn \
--db-logging 1
\ No newline at end of file
if ENABLE_IO
IO_LIBS=$(top_builddir)/extensions/IOControl/libUniSet2IOControl.la
IO_CFLAGS=-I$(top_builddir)/extensions/IOControl -DUNISET_ENABLE_IO
else
IO_LIBS=
IO_CFLAGS=
endif
bin_PROGRAMS = @PACKAGE@-smemory-plus bin_PROGRAMS = @PACKAGE@-smemory-plus
@PACKAGE@_smemory_plus_LDADD = $(top_builddir)/lib/libUniSet2.la \ @PACKAGE@_smemory_plus_LDADD = $(top_builddir)/lib/libUniSet2.la \
...@@ -5,18 +13,18 @@ bin_PROGRAMS = @PACKAGE@-smemory-plus ...@@ -5,18 +13,18 @@ bin_PROGRAMS = @PACKAGE@-smemory-plus
$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \ $(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
$(top_builddir)/extensions/ModbusMaster/libUniSet2RTU.la \ $(top_builddir)/extensions/ModbusMaster/libUniSet2RTU.la \
$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \ $(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
$(top_builddir)/extensions/IOControl/libUniSet2IOControl.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(IO_LIBS) \
$(SIGC_LIBS) $(COMCPP_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS)
@PACKAGE@_smemory_plus_CXXFLAGS = -I$(top_builddir)/extensions/CanNetwork \ @PACKAGE@_smemory_plus_CXXFLAGS = \
-I$(top_builddir)/extensions/UNetUDP \ -I$(top_builddir)/extensions/UNetUDP \
-I$(top_builddir)/extensions/ModbusMaster \ -I$(top_builddir)/extensions/ModbusMaster \
-I$(top_builddir)/extensions/ModbusSlave \ -I$(top_builddir)/extensions/ModbusSlave \
-I$(top_builddir)/extensions/IOControl \
-I$(top_builddir)/extensions/SharedMemory \ -I$(top_builddir)/extensions/SharedMemory \
-I$(top_builddir)/extensions/include \ -I$(top_builddir)/extensions/include \
$(IO_CFLAGS) \
$(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
@PACKAGE@_smemory_plus_SOURCES = smemory-plus.cc @PACKAGE@_smemory_plus_SOURCES = smemory-plus.cc
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
#include "MBSlave.h" #include "MBSlave.h"
#include "MBTCPMaster.h" #include "MBTCPMaster.h"
#include "SharedMemory.h" #include "SharedMemory.h"
#include "IOControl.h"
//#include "UniExchange.h" //#include "UniExchange.h"
#include "UNetExchange.h" #include "UNetExchange.h"
#include "Configuration.h" #include "Configuration.h"
#ifdef UNISET_ENABLE_IO
#include "IOControl.h"
#endif
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
using namespace std; using namespace std;
using namespace UniSetTypes; using namespace UniSetTypes;
...@@ -50,6 +52,7 @@ int main( int argc, const char **argv ) ...@@ -50,6 +52,7 @@ int main( int argc, const char **argv )
act->addManager(static_cast<class UniSetManager*>(shm)); act->addManager(static_cast<class UniSetManager*>(shm));
#ifdef UNISET_ENABLE_IO
// ------------ IOControl ---------------- // ------------ IOControl ----------------
std::list< ThreadCreator<IOControl>* > lst_iothr; std::list< ThreadCreator<IOControl>* > lst_iothr;
for( unsigned int i=0; i<MaxAddNum; i++ ) for( unsigned int i=0; i<MaxAddNum; i++ )
...@@ -81,6 +84,7 @@ int main( int argc, const char **argv ) ...@@ -81,6 +84,7 @@ int main( int argc, const char **argv )
lst_iothr.push_back( io_thr ); lst_iothr.push_back( io_thr );
} }
} }
#endif
// ------------- RTU Exchange -------------- // ------------- RTU Exchange --------------
for( unsigned int i=0; i<MaxAddNum; i++ ) for( unsigned int i=0; i<MaxAddNum; i++ )
{ {
...@@ -175,8 +179,10 @@ int main( int argc, const char **argv ) ...@@ -175,8 +179,10 @@ int main( int argc, const char **argv )
SystemMessage sm(SystemMessage::StartUp); SystemMessage sm(SystemMessage::StartUp);
act->broadcast( sm.transport_msg() ); act->broadcast( sm.transport_msg() );
#ifdef UNISET_IO_ENABLE
for( std::list< ThreadCreator<IOControl>* >::iterator it=lst_iothr.begin(); it!=lst_iothr.end(); ++it ) for( std::list< ThreadCreator<IOControl>* >::iterator it=lst_iothr.begin(); it!=lst_iothr.end(); ++it )
(*it)->start(); (*it)->start();
#endif
act->run(false); act->run(false);
on_sigchild(SIGTERM); on_sigchild(SIGTERM);
...@@ -213,8 +219,10 @@ void help_print( int argc, const char* argv[] ) ...@@ -213,8 +219,10 @@ void help_print( int argc, const char* argv[] )
cout << endl << "###### SM options ######" << endl; cout << endl << "###### SM options ######" << endl;
SharedMemory::help_print(argc,argv); SharedMemory::help_print(argc,argv);
#ifdef UNISET_IO_ENABLE
cout << endl << "###### IO options ###### (prefix: --ioX)" << endl; cout << endl << "###### IO options ###### (prefix: --ioX)" << endl;
IOControl::help_print(argc,argv); IOControl::help_print(argc,argv);
#endif
cout << endl << "###### RTU options ###### (prefix: --rtuX)" << endl; cout << endl << "###### RTU options ###### (prefix: --rtuX)" << endl;
RTUExchange::help_print(argc,argv); RTUExchange::help_print(argc,argv);
......
...@@ -7,16 +7,18 @@ lib_LTLIBRARIES = libUniSet2Network.la ...@@ -7,16 +7,18 @@ lib_LTLIBRARIES = libUniSet2Network.la
libUniSet2Network_la_LDFLAGS = -version-info $(UNET_VER) libUniSet2Network_la_LDFLAGS = -version-info $(UNET_VER)
libUniSet2Network_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \ libUniSet2Network_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la \ $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
libUniSet2Network_la_CPPFLAGS = $(SIGC_CFLAGS) \ $(COMCPP_LIBS)
libUniSet2Network_la_CPPFLAGS = $(SIGC_CFLAGS) $(COMCPP_CFLAGS)\
-I$(top_builddir)/extensions/include \ -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/SharedMemory
libUniSet2Network_la_SOURCES = UniExchange.cc libUniSet2Network_la_SOURCES = UniExchange.cc
@PACKAGE@_network_LDADD = libUniSet2Network.la \ @PACKAGE@_network_LDADD = libUniSet2Network.la \
$(top_builddir)/lib/libUniSet2.la \ $(top_builddir)/lib/libUniSet2.la \
$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
@PACKAGE@_network_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include $(COMCPP_LIBS)
@PACKAGE@_network_CPPFLAGS = $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_network_SOURCES = uninet.cc @PACKAGE@_network_SOURCES = uninet.cc
# install # install
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
lib_LTLIBRARIES = libUniSet2.la lib_LTLIBRARIES = libUniSet2.la
libUniSet2_la_SOURCES = libUniSet2_la_SOURCES =
libUniSet2_la_LDFLAGS = -version-info @LIBVER@ libUniSet2_la_LDFLAGS = -version-info @LIBVER@
libUniSet2_la_LIBADD = \ libUniSet2_la_LIBADD = -lm \
$(top_builddir)/src/Communications/libCommunications.la \ $(top_builddir)/src/Communications/libCommunications.la \
$(top_builddir)/src/Communications/Modbus/libModbus.la \ $(top_builddir)/src/Communications/Modbus/libModbus.la \
$(top_builddir)/src/Interfaces/libInterfaces.la \ $(top_builddir)/src/Interfaces/libInterfaces.la \
......
...@@ -21,9 +21,9 @@ UConnector_wrap.cxx: UConnector.i UConnector.h ...@@ -21,9 +21,9 @@ UConnector_wrap.cxx: UConnector.i UConnector.h
swig -python -c++ -classic UConnector.i swig -python -c++ -classic UConnector.i
_pyUModbus_la_SOURCES = UModbus.cc UModbus_wrap.cxx _pyUModbus_la_SOURCES = UModbus.cc UModbus_wrap.cxx
_pyUModbus_la_CXXFLAGS = $(UNISET_CFLAGS) $(UNISET_EXT_CFLAGS) $(PYTHON_CFLAGS) _pyUModbus_la_CXXFLAGS = $(UNISET_CFLAGS) $(UNISET_EXT_CFLAGS) $(COMCPP_CFLAGS) $(PYTHON_CFLAGS)
_pyUModbus_la_LDFLAGS = -module -avoid-version _pyUModbus_la_LDFLAGS = -module -avoid-version
_pyUModbus_la_LIBADD = $(UNISET_LIBS) $(UNISET_EXT_LIBS) $(PYTHON_LIBS) _pyUModbus_la_LIBADD = $(UNISET_LIBS) $(UNISET_EXT_LIBS) $(COMCPP_LIBS) $(PYTHON_LIBS)
UModbus_wrap.cxx: UInterface.i UModbus.h UModbus_wrap.cxx: UInterface.i UModbus.h
swig -python -c++ -classic UModbus.i swig -python -c++ -classic UModbus.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