From: Francis Dupont <fdupont@isc.org>
Date: Fri, 28 Sep 2018 12:48:39 +0000 (+0200)
Subject: [65-libyang-database_rebased] Addressed rebase conflicts
X-Git-Tag: 171-keactrl-tests-not-posix_base~7^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b0392865b465cf63fb494e2cceba2ae1b8b8ab;p=thirdparty%2Fkea.git

[65-libyang-database_rebased] Addressed rebase conflicts
---

c2b0392865b465cf63fb494e2cceba2ae1b8b8ab
diff --cc src/lib/yang/Makefile.am
index 9df3306b8b,11b924f62c..935839e327
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -8,11 -8,11 +8,13 @@@ 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_database.cc translator_database.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_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
@@@ -29,8 -29,8 +31,9 @@@ libkea_yang_include_HEADERS = 
  	adaptor.h \
  	sysrepo_error.h \
  	translator.h \
+ 	translator_database.h \
 -	translator_option_data.h
 +	translator_option_data.h \
 +	translator_option_def.h
  
  EXTRA_DIST = yang.dox
  # Distribute yang models.
diff --cc src/lib/yang/tests/Makefile.am
index ec2f7ede94,8dcb01d677..69206d5b72
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,8 -20,8 +20,9 @@@ 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_database_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
 +run_unittests_SOURCES += translator_option_def_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)