From: Francis Dupont Date: Fri, 28 Sep 2018 12:30:47 +0000 (+0200) Subject: [65-libyang-pool_rebased] Addressed rebase conflicts X-Git-Tag: 153-netconf-control-socket_base~2^2~4 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=27383d6d48ce2b1c7d1f5f0bc482b8326dc61de0;p=thirdparty%2Fkea.git [65-libyang-pool_rebased] Addressed rebase conflicts --- 27383d6d48ce2b1c7d1f5f0bc482b8326dc61de0 diff --cc src/lib/yang/Makefile.am index 9df3306b8b,44bdcfd5ae..22ae5a7751 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@@ -10,8 -10,7 +10,9 @@@ libkea_yang_la_SOURCES += sysrepo_error libkea_yang_la_SOURCES += translator.cc translator.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 +libkea_yang_la_SOURCES += translator_option_def.h + libkea_yang_la_SOURCES += translator_pool.cc translator_pool.h libkea_yang_la_LIBADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la @@@ -30,7 -29,7 +31,11 @@@ libkea_yang_include_HEADERS = sysrepo_error.h \ translator.h \ translator_option_data.h \ ++<<<<<<< HEAD + translator_option_def.h ++======= + translator_pool.h ++>>>>>>> 65-libyang-pool EXTRA_DIST = yang.dox # Distribute yang models. diff --cc src/lib/yang/tests/Makefile.am index ec2f7ede94,18f855b078..58018a599b --- 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_option_data_unittests.cc +run_unittests_SOURCES += translator_option_def_unittests.cc + run_unittests_SOURCES += translator_pool_unittests.cc run_unittests_SOURCES += run_unittests.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)