From: Francis Dupont Date: Tue, 16 Oct 2018 15:39:24 +0000 (+0200) Subject: [65-libyang-logger_rebased] Addressed rebase conflicts X-Git-Tag: 153-netconf-configs_base^2~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e25a90058934cbd516b59c0c196ae5173a4e90a6;p=thirdparty%2Fkea.git [65-libyang-logger_rebased] Addressed rebase conflicts --- e25a90058934cbd516b59c0c196ae5173a4e90a6 diff --cc src/lib/yang/Makefile.am index 899bb78bef,e5ecff2a89..b61f3b9881 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@@ -10,7 -10,7 +10,8 @@@ libkea_yang_la_SOURCES += sysrepo_error 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_database.cc translator_database.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 @@@ -36,7 -35,7 +37,8 @@@ libkea_yang_include_HEADERS = sysrepo_error.h \ translator.h \ translator_control_socket.h \ + translator_database.h \ + translator_logger.h \ translator_option_data.h \ translator_option_def.h \ translator_pool.h \ diff --cc src/lib/yang/tests/Makefile.am index e7646371f7,125d1f77e6..545078bfb9 --- a/src/lib/yang/tests/Makefile.am +++ b/src/lib/yang/tests/Makefile.am @@@ -21,7 -21,7 +21,8 @@@ run_unittests_SOURCES = adaptor_unitte run_unittests_SOURCES += sysrepo_setup.h run_unittests_SOURCES += translator_unittests.cc run_unittests_SOURCES += translator_control_socket_unittests.cc +run_unittests_SOURCES += translator_database_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