[128-netconf-use-libprocess_rebased] Resolved rebase conflicts

diff --cc src/bin/netconf/Makefile.am
index 644f6be5b72eda703540c8badee7e6b03a98acad,ce81c68e569e35fc8c57ecb10f71318efbb57f0e..3d8d770f9936e0567ee17e164964ed088dcf649f
--- 1/src/bin/netconf/Makefile.am
--- 2/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@@ -44,11 -46,11 +44,16 @@@ BUILT_SOURCES = netconf_messages.h netc
  
  noinst_LTLIBRARIES = libnetconf.la
  
- libnetconf_la_SOURCES  = netconf_log.cc netconf_log.h
- libnetconf_la_SOURCES += parser_context.cc parser_context.h
- libnetconf_la_SOURCES += parser_context_decl.h netconf_lexer.ll
+ libnetconf_la_SOURCES  = netconf_cfg_mgr.cc netconf_cfg_mgr.h
 -libnetconf_la_SOURCES += netconf_controller.h netconf_controller.cc
++libnetconf_la_SOURCES += netconf_controller.cc netconf_controller.h
+ libnetconf_la_SOURCES += netconf_log.cc netconf_log.h
 +libnetconf_la_SOURCES += netconf_parser.cc netconf_parser.h
+ libnetconf_la_SOURCES += netconf_process.cc netconf_process.h
++libnetconf_la_SOURCES += parser_context.cc parser_context.h
++libnetconf_la_SOURCES += parser_context_decl.h
+ libnetconf_la_SOURCES += simple_parser.cc simple_parser.h
 +libnetconf_la_SOURCES += location.hh position.hh stack.hh
++libnetconf_la_SOURCES += netconf_lexer.ll netconf_parser.yy
  
  nodist_libnetconf_la_SOURCES = netconf_messages.h netconf_messages.cc
  

diff --cc src/bin/netconf/tests/Makefile.am
index bcfbc69f382e1fe2ea2de5dc12cbbbec7303abe4,ec9dcc472545cba28ba03eebde58a935eed7cc01..4cb7cf5f8d50762cd702cf8b541f86d6b08ad353
--- 1/src/bin/netconf/tests/Makefile.am
--- 2/src/bin/netconf/tests/Makefile.am
+++ b/src/bin/netconf/tests/Makefile.am
@@@ -18,12 -18,12 +18,13 @@@ check-local
  AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
  AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
+ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
  AM_CPPFLAGS += $(BOOST_INCLUDES)
 +AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/netconf\"
  
  CLEANFILES = *.json *.log
  
--DISTCLEANFILES = netconf_tests.sh
++DISTCLEANFILES = netconf_tests.sh test_libraries.h
  
  AM_CXXFLAGS = $(KEA_CXXFLAGS)
  
@@@ -37,10 -37,15 +38,15 @@@ TESTS_ENVIRONMENT = 
  TESTS =
  if HAVE_GTEST
  
+ noinst_LTLIBRARIES = libbasic.la
+ 
  TESTS += netconf_unittests
  
- netconf_unittests_SOURCES  = run_unittests.cc
+ netconf_unittests_SOURCES  = netconf_cfg_mgr_unittests.cc
+ netconf_unittests_SOURCES += netconf_controller_unittests.cc
 -netconf_unittests_SOURCES += netconf_env_unittest.cc
+ netconf_unittests_SOURCES += netconf_process_unittests.cc
 +netconf_unittests_SOURCES += parser_unittests.cc
+ netconf_unittests_SOURCES += run_unittests.cc
  
  netconf_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  netconf_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)