From: Francis Dupont <fdupont@isc.org>
Date: Fri, 14 Sep 2018 21:56:30 +0000 (+0200)
Subject: [rebasing] [65-libyang-adaptor] rebased
X-Git-Tag: 30-implement-control-socket-for-ddns_base~1^2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=142eb8f7b76bfc512fd8ded797721367af3085db;p=thirdparty%2Fkea.git

[rebasing] [65-libyang-adaptor] rebased
---

142eb8f7b76bfc512fd8ded797721367af3085db
diff --cc src/lib/yang/Makefile.am
index 01b3a633af,8eb5b2ebcc..b1b591e679
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -5,8 -5,7 +5,9 @@@ 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  = adaptor.cc adaptor.h
++libkea_yang_la_SOURCES += sysrepo_error.h
 +libkea_yang_la_SOURCES += translator.cc translator.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
@@@ -21,8 -20,7 +22,9 @@@ 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
++	adaptor.h \
 +	sysrepo_error.h \
 +	translator.h
  
  EXTRA_DIST = yang.dox
  
diff --cc src/lib/yang/tests/Makefile.am
index f54de89164,a4ebb5d138..8d3b9b8e06
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -17,7 -15,7 +17,8 @@@ 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 += translator_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)