Удалил неиспользуемые файлы (setting.mk, common.mk). idl.mk - перенёс в /IDL

IDL/Makefile.am

@@ -3,4 +3,3 @@
 ############################################################################
 
 SUBDIRS = UniSetTypes Processes
-include $(top_builddir)/conf/common.mk

IDL/Processes/Makefile.am

@@ -9,7 +9,7 @@ HHDIR=$(top_builddir)/include
 # Исходные файлы IDL
 IDLFILES=IOController_i.idl
 
-include $(top_builddir)/conf/idl.mk
+include $(top_builddir)/IDL/idl.mk
 
 idl_include_HEADERS = *.idl
 idl_includedir = $(datadir)/idl/@PACKAGE@/Processes

IDL/UniSetTypes/Makefile.am

@@ -9,7 +9,7 @@ HHDIR=$(top_builddir)/include
 # Исходные файлы IDL
 IDLFILES=UniSetTypes_i.idl UniSetObject_i.idl UniSetManager_i.idl
 
-include $(top_builddir)/conf/idl.mk
+include $(top_builddir)/IDL/idl.mk
 
 idl_include_HEADERS = *.idl
 idl_includedir = $(datadir)/idl/@PACKAGE@/UniSetTypes

conf/idl.mk → IDL/idl.mk

@@ -33,4 +33,3 @@ depend:
 
 
 install:
-	

Makefile.am

@@ -5,8 +5,6 @@
 FIRSTSUBDIRS=IDL
 SUBDIRS=. src lib include Utilities extensions python docs
 
-include $(top_builddir)/conf/common.mk
-
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet.pc
 

Utilities/Admin/Makefile.am

@@ -7,6 +7,3 @@ uniset_admin_SOURCES 	= admin.cc
 uniset_admin_LDADD 		= $(top_builddir)/lib/libUniSet.la
 uniset_admin_CPPFLAGS	= -I$(top_builddir)/lib
 
-
-include $(top_builddir)/conf/setting.mk
-

Utilities/Makefile.am

@@ -5,7 +5,5 @@
 SUBDIRS = scripts Admin NullController SViewer-text \
 	SMonit MBTester codegen SImitator
 
-include $(top_builddir)/conf/common.mk
-
 
 

Utilities/NullController/Makefile.am

@@ -7,5 +7,3 @@ uniset_nullController_SOURCES	= NullController.cc main.cc
 uniset_nullController_LDADD 	= $(top_builddir)/lib/libUniSet.la
 uniset_nullController_CPPFLAGS	= -I$(top_builddir)/lib $(SIGC_CFLAGS)
 
-include $(top_builddir)/conf/setting.mk
-

Utilities/SViewer-text/Makefile.am

@@ -6,6 +6,3 @@ bin_PROGRAMS 					= uniset-sviewer-text
 uniset_sviewer_text_SOURCES		= main.cc
 uniset_sviewer_text_LDADD 		= $(top_builddir)/lib/libUniSet.la
 uniset_sviewer_text_CPPFLAGS	= -I$(top_builddir)/lib
-
-include $(top_builddir)/conf/setting.mk
-

Utilities/scripts/Makefile.am

@@ -2,7 +2,5 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
 
-include $(top_builddir)/conf/common.mk
-
 bin_SCRIPTS = uniset-start.sh uniset-stop.sh uniset-functions.sh
 

extensions/DBServer-MySQL/Makefile.am

@@ -13,8 +13,6 @@ bin_PROGRAMS 					= uniset-mysql-dbserver
 uniset_mysql_dbserver_LDADD		= libUniSet-mysql.la $(top_builddir)/lib/libUniSet.la
 uniset_mysql_dbserver_SOURCES	= main.cc
 
-include $(top_builddir)/conf/setting.mk
-
 # install
 devel_include_HEADERS = *.h
 devel_includedir = $(includedir)/@PACKAGE@/mysql

extensions/DBServer-SQLite/Makefile.am

@@ -18,8 +18,6 @@ noinst_PROGRAMS = sqlite-test
 sqlite_test_LDADD = libUniSet-sqlite.la $(top_builddir)/lib/libUniSet.la
 sqlite_test_SOURCES = test.cc
 
-include $(top_builddir)/conf/setting.mk
-
 # install
 devel_include_HEADERS = *.h
 devel_includedir = $(includedir)/@PACKAGE@/sqlite

extensions/Makefile.am

@@ -18,7 +18,4 @@ else
 SUBDIRS =
 endif
 
-include $(top_builddir)/conf/common.mk
-
-
 

extensions/SharedMemory/Makefile.am

@@ -17,8 +17,6 @@ libUniSetSharedMemory_la_SOURCES 	= SharedMemory.cc
 @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 = $(pkgincludedir)/extensions

extensions/UniNetwork/Makefile.am

@@ -19,8 +19,6 @@ libUniSetNetwork_la_SOURCES 	= UniExchange.cc
 @PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 @PACKAGE@_network_SOURCES 	= uninet.cc
 
-include $(top_builddir)/conf/setting.mk
-
 # install
 devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions

include/Makefile.am

@@ -3,8 +3,6 @@
 ############################################################################
 
 SUBDIRS=modbus
-include $(top_builddir)/conf/common.mk
-
 
 # install
 devel_include_HEADERS = *.h *.hh *.tcc

src/Communications/Makefile.am

@@ -6,4 +6,3 @@ SUBDIRS=Modbus
 noinst_LTLIBRARIES 				= libCommunications.la
 libCommunications_la_SOURCES	= ComPort.cc ComPort485F.cc
 
-include $(top_builddir)/conf/common.mk
\ No newline at end of file

src/Communications/Modbus/Makefile.am

@@ -9,5 +9,3 @@ libModbus_la_SOURCES	= ModbusTypes.cc ModbusHelpers.cc \
 	
 libModbus_la_CXXFLAGS	= -I$(top_builddir)/include/Communications/modbus $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 libModbus_la_LIBADD		= $(SIGC_LIBS) $(COMCPP_LIBS)
-
-include $(top_builddir)/conf/setting.mk

src/Interfaces/Makefile.am

@@ -4,4 +4,3 @@
 
 noinst_LTLIBRARIES 			= libInterfaces.la
 libInterfaces_la_SOURCES	= UInterface.cc
-include $(top_builddir)/conf/setting.mk

src/Makefile.am

@@ -4,5 +4,3 @@
 
 SUBDIRS=ObjectRepository Processes Interfaces Timers Services Various Communications
 
-include $(top_builddir)/conf/common.mk
-

src/ObjectRepository/Makefile.am

@@ -6,7 +6,5 @@ libObjectsRepository_la_SOURCES = UniSetTypes_iSK.cc UniSetObject_iSK.cc UniSetT
 	ProxyManager.cc PassiveObject.cc UniSetObject_LT.cc UniSetManager_LT.cc IORFile.cc
 #	ServiceActivator.cc
 
-include $(top_builddir)/conf/setting.mk
-
 #clean-local:
 #	rm -rf *iSK.cc
\ No newline at end of file

src/Processes/Makefile.am

@@ -8,7 +8,5 @@ libProcesses_la_LIBADD		= $(SIGC_LIBS)
 libProcesses_la_SOURCES		= IOController_iSK.cc IOController.cc IONotifyController.cc IONotifyController_LT.cc \
 	NCRestorer.cc NCRestorer_XML.cc
 
-include $(top_builddir)/conf/setting.mk
-
 local-clean:
 	rm -rf *iSK.cc
\ No newline at end of file

src/Services/Makefile.am

@@ -6,7 +6,5 @@ libServices_la_CPPFLAGS	= $(SIGC_CFLAGS)
 libServices_la_LIBADD 	= $(SIGC_LIBS)
 libServices_la_SOURCES 	= DBServer.cc
 
-include $(top_builddir)/conf/setting.mk
-
 local-clean:
 	rm -rf *iSK.cc
\ No newline at end of file

src/Timers/Makefile.am

@@ -3,5 +3,3 @@
 ############################################################################
 noinst_LTLIBRARIES = libTimers.la
 libTimers_la_SOURCES=PassiveTimer.cc PassiveSysTimer.cc ThrPassiveTimer.cc
-
-include $(top_builddir)/conf/setting.mk

src/Various/Makefile.am

@@ -8,8 +8,6 @@ libVarious_la_LIBADD 	= $(SIGC_LIBS) $(COMCPP_LIBS)
 libVarious_la_SOURCES 	= DebugStream.cc Debug.cc UniXML.cc MessageType.cc Configuration.cc \
 	Restorer_XML.cc RunLock.cc Mutex.cc SViewer.cc SMonitor.cc LT_Object.cc WDTInterface.cc 	
 
-include $(top_builddir)/conf/setting.mk
-
 local-clean:
 	rm -rf *iSK.cc
 	
\ No newline at end of file

tests/Makefile.am

@@ -50,6 +50,3 @@ dlog_SOURCES = dlog.cc
 dlog_LDADD 	= $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS)
 dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
 
-
-include $(top_builddir)/conf/setting.mk
-

tests/UniXmlTest/Makefile.am

@@ -7,5 +7,3 @@ xmltest_SOURCES 	= XmlTest.cc
 xmltest_LDADD 		= $(top_builddir)/lib/libUniSet.la
 xmltest_CPPFLAGS	= -I$(top_builddir)/include
 
-include $(top_builddir)/conf/setting.mk
-