From: Mukund Sivaraman Date: Wed, 7 Nov 2012 07:35:21 +0000 (+0530) Subject: Merge branch 'master' into trac2369 X-Git-Tag: trac2487_base~18^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=560a71919bda37ad20e54efed07183acc5413a8a;p=thirdparty%2Fkea.git Merge branch 'master' into trac2369 --- 560a71919bda37ad20e54efed07183acc5413a8a diff --cc src/lib/dns/Makefile.am index 17d62964f3,5cf07321c0..e81ef76a8d --- a/src/lib/dns/Makefile.am +++ b/src/lib/dns/Makefile.am @@@ -93,9 -93,9 +93,10 @@@ libb10_dns___la_LDFLAGS = -no-undefine libb10_dns___la_SOURCES = libb10_dns___la_SOURCES += edns.h edns.cc libb10_dns___la_SOURCES += exceptions.h exceptions.cc +libb10_dns___la_SOURCES += master_lexer_inputsource.h master_lexer_inputsource.cc libb10_dns___la_SOURCES += labelsequence.h labelsequence.cc libb10_dns___la_SOURCES += masterload.h masterload.cc + libb10_dns___la_SOURCES += master_lexer.h master_lexer.cc libb10_dns___la_SOURCES += message.h message.cc libb10_dns___la_SOURCES += messagerenderer.h messagerenderer.cc libb10_dns___la_SOURCES += name.h name.cc diff --cc src/lib/dns/tests/Makefile.am index 2f51496470,6df0e624d4..35d659c83a --- a/src/lib/dns/tests/Makefile.am +++ b/src/lib/dns/tests/Makefile.am @@@ -22,9 -22,9 +22,10 @@@ if HAVE_GTES TESTS += run_unittests run_unittests_SOURCES = unittest_util.h unittest_util.cc run_unittests_SOURCES += edns_unittest.cc +run_unittests_SOURCES += master_lexer_inputsource_unittest.cc run_unittests_SOURCES += labelsequence_unittest.cc run_unittests_SOURCES += messagerenderer_unittest.cc + run_unittests_SOURCES += master_lexer_token_unittest.cc run_unittests_SOURCES += name_unittest.cc run_unittests_SOURCES += nsec3hash_unittest.cc run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc