From: Francis Dupont <fdupont@isc.org>
Date: Tue, 25 Sep 2018 15:21:44 +0000 (+0200)
Subject: [65-libyang-database_rebased] Fixed rebase conflicts
X-Git-Tag: 171-keactrl-tests-not-posix_base~7^2~1^2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e26d84ada92798408c682fd2fa783f4b75a54db;p=thirdparty%2Fkea.git

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

7e26d84ada92798408c682fd2fa783f4b75a54db
diff --cc src/lib/yang/Makefile.am
index 4761a7127d,d295644f8c..11b924f62c
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -5,12 -5,10 +5,14 @@@ AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSR
  AM_CXXFLAGS = $(KEA_CXXFLAGS)
  
  lib_LTLIBRARIES = libkea-yang.la
 -libkea_yang_la_SOURCES = sysrepo_error.h
 +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_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
@@@ -24,26 -22,10 +26,27 @@@ libkea_yang_la_LDFLAGS = -no-undefined 
  # Specify the headers for copying into the installation directory tree.
  libkea_yang_includedir = $(pkgincludedir)/yang
  libkea_yang_include_HEADERS = \
 +	adaptor.h \
  	sysrepo_error.h \
  	translator.h \
 -	translator_database.h
++	translator_database.h \
 +	translator_option_data.h
  
  EXTRA_DIST = yang.dox
 +# Distribute yang models.
 +EXTRA_DIST += models/ietf-dhcpv6-client.yang
 +EXTRA_DIST += models/ietf-dhcpv6-options.yang
 +EXTRA_DIST += models/ietf-dhcpv6-relay.yang
 +EXTRA_DIST += models/ietf-dhcpv6-server.yang
 +EXTRA_DIST += models/ietf-dhcpv6-types.yang
 +EXTRA_DIST += models/ietf-inet-types.yang
 +EXTRA_DIST += models/ietf-yang-types.yang
 +EXTRA_DIST += models/kea-ctrl-agent.yang
 +EXTRA_DIST += models/kea-dhcp-ddns.yang
 +EXTRA_DIST += models/kea-dhcp-types.yang
 +EXTRA_DIST += models/kea-dhcp4-server.yang
 +EXTRA_DIST += models/kea-dhcp6-server.yang
 +EXTRA_DIST += models/kea-logging.yang
 +EXTRA_DIST += models/kea-types.yang
  
  CLEANFILES = *.gcno *.gcda
diff --cc src/lib/yang/tests/Makefile.am
index 5e593f1d19,471f984fb8..8dcb01d677
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -17,10 -17,8 +17,11 @@@ EXTRA_DIST = keatest-module.yan
  TESTS =
  if HAVE_GTEST
  TESTS += run_unittests
 -run_unittests_SOURCES  = translator_unittests.cc
 +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 += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)