Skip to content

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

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

parent 8b248080
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 60 deletions
IDL/Makefile.am
View file @ 3b87b86c
...@@ -3,4 +3,3 @@ ...@@ -3,4 +3,3 @@
############################################################################ ############################################################################
SUBDIRS = UniSetTypes Processes SUBDIRS = UniSetTypes Processes
include $(top_builddir)/conf/common.mk
IDL/Processes/Makefile.am
View file @ 3b87b86c
...@@ -9,7 +9,7 @@ HHDIR=$(top_builddir)/include ...@@ -9,7 +9,7 @@ HHDIR=$(top_builddir)/include
# Исходные файлы IDL # Исходные файлы IDL
IDLFILES=IOController_i.idl IDLFILES=IOController_i.idl
include $(top_builddir)/conf/idl.mk include $(top_builddir)/IDL/idl.mk
idl_include_HEADERS = *.idl idl_include_HEADERS = *.idl
idl_includedir = $(datadir)/idl/@PACKAGE@/Processes idl_includedir = $(datadir)/idl/@PACKAGE@/Processes
IDL/UniSetTypes/Makefile.am
View file @ 3b87b86c
...@@ -9,7 +9,7 @@ HHDIR=$(top_builddir)/include ...@@ -9,7 +9,7 @@ HHDIR=$(top_builddir)/include
# Исходные файлы IDL # Исходные файлы IDL
IDLFILES=UniSetTypes_i.idl UniSetObject_i.idl UniSetManager_i.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_include_HEADERS = *.idl
idl_includedir = $(datadir)/idl/@PACKAGE@/UniSetTypes idl_includedir = $(datadir)/idl/@PACKAGE@/UniSetTypes
conf/idl.mk → IDL/idl.mk
View file @ 3b87b86c
...@@ -15,10 +15,10 @@ CCTARG=$(patsubst %.idl, ${CCDIR}/%SK.cc, ${IDLFILES}) ...@@ -15,10 +15,10 @@ CCTARG=$(patsubst %.idl, ${CCDIR}/%SK.cc, ${IDLFILES})
######################################################################## ########################################################################
all: ${HHTARG} ${CCTARG} all: ${HHTARG} ${CCTARG}
dynamic: all dynamic: all
${HHTARG} ${CCTARG}: ${IDLFILES} ${HHTARG} ${CCTARG}: ${IDLFILES}
for i in $^; do ${IDL} -v -bcxx ${IDLFLAGS} $$i; done for i in $^; do ${IDL} -v -bcxx ${IDLFLAGS} $$i; done
...@@ -30,7 +30,6 @@ clean: ...@@ -30,7 +30,6 @@ clean:
${RM} ${HHTARG} ${CCTARG} ${RM} ${HHTARG} ${CCTARG}
depend: depend:
install: install:
Makefile.am
View file @ 3b87b86c
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
FIRSTSUBDIRS=IDL FIRSTSUBDIRS=IDL
SUBDIRS=. src lib include Utilities extensions python docs SUBDIRS=. src lib include Utilities extensions python docs
include $(top_builddir)/conf/common.mk
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSet.pc pkgconfig_DATA = libUniSet.pc
......
Utilities/Admin/Makefile.am
View file @ 3b87b86c
...@@ -7,6 +7,3 @@ uniset_admin_SOURCES = admin.cc ...@@ -7,6 +7,3 @@ uniset_admin_SOURCES = admin.cc
uniset_admin_LDADD = $(top_builddir)/lib/libUniSet.la uniset_admin_LDADD = $(top_builddir)/lib/libUniSet.la
uniset_admin_CPPFLAGS = -I$(top_builddir)/lib uniset_admin_CPPFLAGS = -I$(top_builddir)/lib
include $(top_builddir)/conf/setting.mk
Utilities/Makefile.am
View file @ 3b87b86c
...@@ -5,7 +5,5 @@ ...@@ -5,7 +5,5 @@
SUBDIRS = scripts Admin NullController SViewer-text \ SUBDIRS = scripts Admin NullController SViewer-text \
SMonit MBTester codegen SImitator SMonit MBTester codegen SImitator
include $(top_builddir)/conf/common.mk
Utilities/NullController/Makefile.am
View file @ 3b87b86c
...@@ -7,5 +7,3 @@ uniset_nullController_SOURCES = NullController.cc main.cc ...@@ -7,5 +7,3 @@ uniset_nullController_SOURCES = NullController.cc main.cc
uniset_nullController_LDADD = $(top_builddir)/lib/libUniSet.la uniset_nullController_LDADD = $(top_builddir)/lib/libUniSet.la
uniset_nullController_CPPFLAGS = -I$(top_builddir)/lib $(SIGC_CFLAGS) uniset_nullController_CPPFLAGS = -I$(top_builddir)/lib $(SIGC_CFLAGS)
include $(top_builddir)/conf/setting.mk
Utilities/SViewer-text/Makefile.am
View file @ 3b87b86c
...@@ -6,6 +6,3 @@ bin_PROGRAMS = uniset-sviewer-text ...@@ -6,6 +6,3 @@ bin_PROGRAMS = uniset-sviewer-text
uniset_sviewer_text_SOURCES = main.cc uniset_sviewer_text_SOURCES = main.cc
uniset_sviewer_text_LDADD = $(top_builddir)/lib/libUniSet.la uniset_sviewer_text_LDADD = $(top_builddir)/lib/libUniSet.la
uniset_sviewer_text_CPPFLAGS = -I$(top_builddir)/lib uniset_sviewer_text_CPPFLAGS = -I$(top_builddir)/lib
include $(top_builddir)/conf/setting.mk
Utilities/scripts/Makefile.am
View file @ 3b87b86c
...@@ -2,7 +2,5 @@ ...@@ -2,7 +2,5 @@
# This file is part of the UniSet library # # 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 bin_SCRIPTS = uniset-start.sh uniset-stop.sh uniset-functions.sh
extensions/DBServer-MySQL/Makefile.am
View file @ 3b87b86c
...@@ -13,8 +13,6 @@ bin_PROGRAMS = uniset-mysql-dbserver ...@@ -13,8 +13,6 @@ bin_PROGRAMS = uniset-mysql-dbserver
uniset_mysql_dbserver_LDADD = libUniSet-mysql.la $(top_builddir)/lib/libUniSet.la uniset_mysql_dbserver_LDADD = libUniSet-mysql.la $(top_builddir)/lib/libUniSet.la
uniset_mysql_dbserver_SOURCES = main.cc uniset_mysql_dbserver_SOURCES = main.cc
include $(top_builddir)/conf/setting.mk
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/mysql devel_includedir = $(includedir)/@PACKAGE@/mysql
......
extensions/DBServer-SQLite/Makefile.am
View file @ 3b87b86c
...@@ -18,8 +18,6 @@ noinst_PROGRAMS = sqlite-test ...@@ -18,8 +18,6 @@ noinst_PROGRAMS = sqlite-test
sqlite_test_LDADD = libUniSet-sqlite.la $(top_builddir)/lib/libUniSet.la sqlite_test_LDADD = libUniSet-sqlite.la $(top_builddir)/lib/libUniSet.la
sqlite_test_SOURCES = test.cc sqlite_test_SOURCES = test.cc
include $(top_builddir)/conf/setting.mk
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/sqlite devel_includedir = $(includedir)/@PACKAGE@/sqlite
......
extensions/Makefile.am
View file @ 3b87b86c
...@@ -18,7 +18,4 @@ else ...@@ -18,7 +18,4 @@ else
SUBDIRS = SUBDIRS =
endif endif
include $(top_builddir)/conf/common.mk
extensions/SharedMemory/Makefile.am
View file @ 3b87b86c
...@@ -17,8 +17,6 @@ libUniSetSharedMemory_la_SOURCES = SharedMemory.cc ...@@ -17,8 +17,6 @@ libUniSetSharedMemory_la_SOURCES = SharedMemory.cc
@PACKAGE@_smemory_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include @PACKAGE@_smemory_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_smemory_SOURCES = smemory.cc @PACKAGE@_smemory_SOURCES = smemory.cc
include $(top_builddir)/conf/setting.mk
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
devel_includedir = $(pkgincludedir)/extensions devel_includedir = $(pkgincludedir)/extensions
......
extensions/UniNetwork/Makefile.am
View file @ 3b87b86c
...@@ -19,8 +19,6 @@ libUniSetNetwork_la_SOURCES = UniExchange.cc ...@@ -19,8 +19,6 @@ libUniSetNetwork_la_SOURCES = UniExchange.cc
@PACKAGE@_network_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include @PACKAGE@_network_CPPFLAGS = $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
@PACKAGE@_network_SOURCES = uninet.cc @PACKAGE@_network_SOURCES = uninet.cc
include $(top_builddir)/conf/setting.mk
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
devel_includedir = $(pkgincludedir)/extensions devel_includedir = $(pkgincludedir)/extensions
......
include/Makefile.am
View file @ 3b87b86c
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
############################################################################ ############################################################################
SUBDIRS=modbus SUBDIRS=modbus
include $(top_builddir)/conf/common.mk
# install # install
devel_include_HEADERS = *.h *.hh *.tcc devel_include_HEADERS = *.h *.hh *.tcc
......
src/Communications/Makefile.am
View file @ 3b87b86c
...@@ -6,4 +6,3 @@ SUBDIRS=Modbus ...@@ -6,4 +6,3 @@ SUBDIRS=Modbus
noinst_LTLIBRARIES = libCommunications.la noinst_LTLIBRARIES = libCommunications.la
libCommunications_la_SOURCES = ComPort.cc ComPort485F.cc libCommunications_la_SOURCES = ComPort.cc ComPort485F.cc
include $(top_builddir)/conf/common.mk
\ No newline at end of file
src/Communications/Modbus/Makefile.am
View file @ 3b87b86c
...@@ -9,5 +9,3 @@ libModbus_la_SOURCES = ModbusTypes.cc ModbusHelpers.cc \ ...@@ -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_CXXFLAGS = -I$(top_builddir)/include/Communications/modbus $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
libModbus_la_LIBADD = $(SIGC_LIBS) $(COMCPP_LIBS) libModbus_la_LIBADD = $(SIGC_LIBS) $(COMCPP_LIBS)
include $(top_builddir)/conf/setting.mk
src/Interfaces/Makefile.am
View file @ 3b87b86c
...@@ -4,4 +4,3 @@ ...@@ -4,4 +4,3 @@
noinst_LTLIBRARIES = libInterfaces.la noinst_LTLIBRARIES = libInterfaces.la
libInterfaces_la_SOURCES = UInterface.cc libInterfaces_la_SOURCES = UInterface.cc
include $(top_builddir)/conf/setting.mk
src/Makefile.am
View file @ 3b87b86c
...@@ -4,5 +4,3 @@ ...@@ -4,5 +4,3 @@
SUBDIRS=ObjectRepository Processes Interfaces Timers Services Various Communications SUBDIRS=ObjectRepository Processes Interfaces Timers Services Various Communications
include $(top_builddir)/conf/common.mk
src/ObjectRepository/Makefile.am
View file @ 3b87b86c
...@@ -6,7 +6,5 @@ libObjectsRepository_la_SOURCES = UniSetTypes_iSK.cc UniSetObject_iSK.cc UniSetT ...@@ -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 ProxyManager.cc PassiveObject.cc UniSetObject_LT.cc UniSetManager_LT.cc IORFile.cc
# ServiceActivator.cc # ServiceActivator.cc
include $(top_builddir)/conf/setting.mk
#clean-local: #clean-local:
# rm -rf *iSK.cc # rm -rf *iSK.cc
\ No newline at end of file
src/Processes/Makefile.am
View file @ 3b87b86c
...@@ -8,7 +8,5 @@ libProcesses_la_LIBADD = $(SIGC_LIBS) ...@@ -8,7 +8,5 @@ libProcesses_la_LIBADD = $(SIGC_LIBS)
libProcesses_la_SOURCES = IOController_iSK.cc IOController.cc IONotifyController.cc IONotifyController_LT.cc \ libProcesses_la_SOURCES = IOController_iSK.cc IOController.cc IONotifyController.cc IONotifyController_LT.cc \
NCRestorer.cc NCRestorer_XML.cc NCRestorer.cc NCRestorer_XML.cc
include $(top_builddir)/conf/setting.mk
local-clean: local-clean:
rm -rf *iSK.cc rm -rf *iSK.cc
\ No newline at end of file
src/Services/Makefile.am
View file @ 3b87b86c
...@@ -6,7 +6,5 @@ libServices_la_CPPFLAGS = $(SIGC_CFLAGS) ...@@ -6,7 +6,5 @@ libServices_la_CPPFLAGS = $(SIGC_CFLAGS)
libServices_la_LIBADD = $(SIGC_LIBS) libServices_la_LIBADD = $(SIGC_LIBS)
libServices_la_SOURCES = DBServer.cc libServices_la_SOURCES = DBServer.cc
include $(top_builddir)/conf/setting.mk
local-clean: local-clean:
rm -rf *iSK.cc rm -rf *iSK.cc
\ No newline at end of file
src/Timers/Makefile.am
View file @ 3b87b86c
...@@ -3,5 +3,3 @@ ...@@ -3,5 +3,3 @@
############################################################################ ############################################################################
noinst_LTLIBRARIES = libTimers.la noinst_LTLIBRARIES = libTimers.la
libTimers_la_SOURCES=PassiveTimer.cc PassiveSysTimer.cc ThrPassiveTimer.cc libTimers_la_SOURCES=PassiveTimer.cc PassiveSysTimer.cc ThrPassiveTimer.cc
include $(top_builddir)/conf/setting.mk
src/Various/Makefile.am
View file @ 3b87b86c
...@@ -8,8 +8,6 @@ libVarious_la_LIBADD = $(SIGC_LIBS) $(COMCPP_LIBS) ...@@ -8,8 +8,6 @@ libVarious_la_LIBADD = $(SIGC_LIBS) $(COMCPP_LIBS)
libVarious_la_SOURCES = DebugStream.cc Debug.cc UniXML.cc MessageType.cc Configuration.cc \ 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 Restorer_XML.cc RunLock.cc Mutex.cc SViewer.cc SMonitor.cc LT_Object.cc WDTInterface.cc
include $(top_builddir)/conf/setting.mk
local-clean: local-clean:
rm -rf *iSK.cc rm -rf *iSK.cc
\ No newline at end of file
tests/Makefile.am
View file @ 3b87b86c
...@@ -50,6 +50,3 @@ dlog_SOURCES = dlog.cc ...@@ -50,6 +50,3 @@ dlog_SOURCES = dlog.cc
dlog_LDADD = $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS) dlog_LDADD = $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS)
dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS) dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
include $(top_builddir)/conf/setting.mk
tests/UniXmlTest/Makefile.am
View file @ 3b87b86c
...@@ -7,5 +7,3 @@ xmltest_SOURCES = XmlTest.cc ...@@ -7,5 +7,3 @@ xmltest_SOURCES = XmlTest.cc
xmltest_LDADD = $(top_builddir)/lib/libUniSet.la xmltest_LDADD = $(top_builddir)/lib/libUniSet.la
xmltest_CPPFLAGS = -I$(top_builddir)/include xmltest_CPPFLAGS = -I$(top_builddir)/include
include $(top_builddir)/conf/setting.mk
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