From: Francis Dupont Date: Wed, 17 Oct 2018 16:58:00 +0000 (+0200) Subject: [65-libyang-pd-pool_rebased] Addressed rebase conflicts X-Git-Tag: 153-netconf-agent_base~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aaecb8b44498a18d9888f2f6ffde3413d460e0d;p=thirdparty%2Fkea.git [65-libyang-pd-pool_rebased] Addressed rebase conflicts --- 3aaecb8b44498a18d9888f2f6ffde3413d460e0d diff --cc src/lib/yang/Makefile.am index 4cc6efac0c,09df0ec0ef..7321b123c5 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@@ -16,7 -16,7 +16,8 @@@ libkea_yang_la_SOURCES += translator_op 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_SOURCES += translator_pd_pool.cc translator_pd_pool.h +libkea_yang_la_SOURCES += translator_host.cc translator_host.h libkea_yang_la_SOURCES += yang_models.h diff --cc src/lib/yang/tests/Makefile.am index 03000fc2ba,7eb665b9a6..33504fef3e --- a/src/lib/yang/tests/Makefile.am +++ b/src/lib/yang/tests/Makefile.am @@@ -25,7 -25,7 +25,8 @@@ run_unittests_SOURCES += translator_dat 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 += translator_pd_pool_unittests.cc +run_unittests_SOURCES += translator_host_unittests.cc run_unittests_SOURCES += run_unittests.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)