From: Francis Dupont <fdupont@isc.org>
Date: Wed, 18 Nov 2015 08:52:21 +0000 (+0100)
Subject: [master] Finished merge of trac4094 (class evaluator)
X-Git-Tag: trac4203_base~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa1e32d952da660960ab66e1f94220e40c6702fc;p=thirdparty%2Fkea.git

[master] Finished merge of trac4094 (class evaluator)
---

fa1e32d952da660960ab66e1f94220e40c6702fc
diff --cc src/lib/eval/Makefile.am
index b2c939409a,3c41c6aaa2..a54210890e
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@@ -13,13 -13,9 +13,14 @@@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIE
  lib_LTLIBRARIES = libkea-eval.la
  libkea_eval_la_SOURCES  =
  libkea_eval_la_SOURCES += eval_log.cc eval_log.h
+ libkea_eval_la_SOURCES += evaluate.cc evaluate.h
  libkea_eval_la_SOURCES += token.cc token.h
  
 +libkea_eval_la_SOURCES += parser.cc parser.h
 +libkea_eval_la_SOURCES += lexer.cc
 +libkea_eval_la_SOURCES += location.hh position.hh stack.hh
 +libkea_eval_la_SOURCES += eval_context.cc eval_context.h eval_context_decl.h
 +
  nodist_libkea_eval_la_SOURCES = eval_messages.h eval_messages.cc
  
  libkea_eval_la_CXXFLAGS = $(AM_CXXFLAGS)
diff --cc src/lib/eval/tests/Makefile.am
index 1dc5b350d2,655aa55856..77d0ad2bf1
--- a/src/lib/eval/tests/Makefile.am
+++ b/src/lib/eval/tests/Makefile.am
@@@ -26,7 -26,7 +26,8 @@@ if HAVE_GTES
  
  TESTS += libeval_unittests
  
 -libeval_unittests_SOURCES  = evaluate_unittest.cc
 +libeval_unittests_SOURCES  = context_unittest.cc
++libeval_unittests_SOURCES += evaluate_unittest.cc
  libeval_unittests_SOURCES += token_unittest.cc
  libeval_unittests_SOURCES += run_unittests.cc
  libeval_unittests_CXXFLAGS = $(AM_CXXFLAGS)