From: Marcin Siodelski Date: Fri, 17 Feb 2017 13:05:23 +0000 (+0100) Subject: [5107] Renamed agent files to match the new pattern. X-Git-Tag: trac5137_base~8^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5db2750ad8fc0a7790a99713047802adcdc9bb8;p=thirdparty%2Fkea.git [5107] Renamed agent files to match the new pattern. --- diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am index de778fe1d2..be4dcfc57d 100644 --- a/src/bin/agent/Makefile.am +++ b/src/bin/agent/Makefile.am @@ -42,16 +42,16 @@ BUILT_SOURCES = ctrl_agent_messages.h ctrl_agent_messages.cc noinst_LTLIBRARIES = libagent.la -libagent_la_SOURCES = ctrl_agent_cfg_mgr.cc ctrl_agent_cfg_mgr.h +libagent_la_SOURCES = agent_lexer.ll +libagent_la_SOURCES += agent_parser.cc agent_parser.h +libagent_la_SOURCES += ctrl_agent_cfg_mgr.cc ctrl_agent_cfg_mgr.h libagent_la_SOURCES += ctrl_agent_controller.cc ctrl_agent_controller.h libagent_la_SOURCES += ctrl_agent_command_mgr.cc ctrl_agent_command_mgr.h libagent_la_SOURCES += ctrl_agent_log.cc ctrl_agent_log.h libagent_la_SOURCES += ctrl_agent_process.cc ctrl_agent_process.h -libagent_la_SOURCES += agent_parser.cc agent_parser.h -libagent_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h libagent_la_SOURCES += ctrl_agent_response_creator.cc ctrl_agent_response_creator.h libagent_la_SOURCES += ctrl_agent_response_creator_factory.h -libagent_la_SOURCES += agent_lexer.ll +libagent_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h nodist_libagent_la_SOURCES = ctrl_agent_messages.h ctrl_agent_messages.cc EXTRA_DIST += ctrl_agent_messages.mes diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am index 626aaa4148..b9ae35b9f1 100644 --- a/src/bin/agent/tests/Makefile.am +++ b/src/bin/agent/tests/Makefile.am @@ -43,13 +43,13 @@ if HAVE_GTEST TESTS += ctrl_agent_unittest ctrl_agent_unittest_SOURCES = ctrl_agent_cfg_mgr_unittest.cc +ctrl_agent_unittest_SOURCES += ctrl_agent_command_mgr_unittest.cc ctrl_agent_unittest_SOURCES += ctrl_agent_controller_unittest.cc -ctrl_agent_unittests_SOURCES += ctrl_agent_command_mgr_unittests.cc -ctrl_agent_unittest_SOURCES += parser_unittest.cc ctrl_agent_unittest_SOURCES += ctrl_agent_process_unittest.cc -ctrl_agent_unittests_SOURCES += ctrl_agent_response_creator_factory_unittests.cc +ctrl_agent_unittest_SOURCES += ctrl_agent_response_creator_unittest.cc +ctrl_agent_unittest_SOURCES += ctrl_agent_response_creator_factory_unittest.cc ctrl_agent_unittest_SOURCES += ctrl_agent_unittest.cc -ctrl_agent_unittests_SOURCES += ctrl_agent_response_creator_unittests.cc +ctrl_agent_unittest_SOURCES += parser_unittest.cc ctrl_agent_unittest_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) ctrl_agent_unittest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS) @@ -64,7 +64,7 @@ ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns. ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la +ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/http/libkea-http.la ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la diff --git a/src/bin/agent/tests/ctrl_agent_command_mgr_unittests.cc b/src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_command_mgr_unittests.cc rename to src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc diff --git a/src/bin/agent/tests/ctrl_agent_response_creator_factory_unittests.cc b/src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_response_creator_factory_unittests.cc rename to src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc diff --git a/src/bin/agent/tests/ctrl_agent_response_creator_unittests.cc b/src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_response_creator_unittests.cc rename to src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc