From: Francis Dupont Date: Sun, 14 Oct 2018 08:30:13 +0000 (+0200) Subject: [65-libyang-logger_rebased] Addressed rebase conflicts X-Git-Tag: 153-netconf-configs_base^2~1^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab9641bfc7ddc8b82ecb458357989abac8c80970;p=thirdparty%2Fkea.git [65-libyang-logger_rebased] Addressed rebase conflicts --- ab9641bfc7ddc8b82ecb458357989abac8c80970 diff --cc src/lib/yang/Makefile.am index 5078360b70,8bb0f5e835..e5ecff2a89 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@@ -8,8 -8,7 +8,9 @@@ lib_LTLIBRARIES = libkea-yang.l libkea_yang_la_SOURCES = adaptor.cc adaptor.h libkea_yang_la_SOURCES += sysrepo_error.h libkea_yang_la_SOURCES += translator.cc translator.h +libkea_yang_la_SOURCES += translator_control_socket.cc +libkea_yang_la_SOURCES += translator_control_socket.h + libkea_yang_la_SOURCES += translator_logger.cc translator_logger.h libkea_yang_la_SOURCES += translator_option_data.cc libkea_yang_la_SOURCES += translator_option_data.h libkea_yang_la_SOURCES += translator_option_def.cc @@@ -33,7 -32,7 +34,8 @@@ libkea_yang_include_HEADERS = adaptor.h \ sysrepo_error.h \ translator.h \ + translator_control_socket.h \ + translator_logger.h \ translator_option_data.h \ translator_option_def.h \ translator_pool.h \ diff --cc src/lib/yang/tests/Makefile.am index 155789f4f4,f919ff9d43..125d1f77e6 --- a/src/lib/yang/tests/Makefile.am +++ b/src/lib/yang/tests/Makefile.am @@@ -20,7 -20,7 +20,8 @@@ TESTS += run_unittest run_unittests_SOURCES = adaptor_unittests.cc run_unittests_SOURCES += sysrepo_setup.h run_unittests_SOURCES += translator_unittests.cc +run_unittests_SOURCES += translator_control_socket_unittests.cc + run_unittests_SOURCES += translator_logger_unittests.cc run_unittests_SOURCES += translator_option_data_unittests.cc run_unittests_SOURCES += translator_option_def_unittests.cc run_unittests_SOURCES += translator_pool_unittests.cc