From: JINMEI Tatuya Date: Mon, 3 Sep 2012 12:55:10 +0000 (+0900) Subject: [master] Merge branch 'trac2098' X-Git-Tag: trac2351_base~91 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b372a33a10fc7518f3dd76a4a94eeec1307eef46;p=thirdparty%2Fkea.git [master] Merge branch 'trac2098' --- b372a33a10fc7518f3dd76a4a94eeec1307eef46 diff --cc src/lib/datasrc/memory/Makefile.am index ef46abe6e8,1fb3fe7083..b04647c366 --- a/src/lib/datasrc/memory/Makefile.am +++ b/src/lib/datasrc/memory/Makefile.am @@@ -12,8 -12,8 +12,9 @@@ noinst_LTLIBRARIES = libdatasrc_memory. libdatasrc_memory_la_SOURCES = domaintree.h libdatasrc_memory_la_SOURCES += rdataset.h rdataset.cc + libdatasrc_memory_la_SOURCES += treenode_rrset.h treenode_rrset.cc libdatasrc_memory_la_SOURCES += rdata_serialization.h rdata_serialization.cc libdatasrc_memory_la_SOURCES += zone_data.h zone_data.cc +libdatasrc_memory_la_SOURCES += segment_object_holder.h libdatasrc_memory_la_SOURCES += zone_table.h zone_table.cc EXTRA_DIST = rdata_serialization_priv.cc diff --cc src/lib/datasrc/memory/benchmarks/Makefile.am index 81d56422cf,f4ae3eefc5..3328699fb3 --- a/src/lib/datasrc/memory/benchmarks/Makefile.am +++ b/src/lib/datasrc/memory/benchmarks/Makefile.am @@@ -9,10 -9,12 +9,13 @@@ endi CLEANFILES = *.gcno *.gcda - noinst_PROGRAMS = rdata_reader_bench + noinst_PROGRAMS = rdata_reader_bench rrset_render_bench rdata_reader_bench_SOURCES = rdata_reader_bench.cc - rdata_reader_bench_LDADD = $(top_builddir)/src/lib/datasrc/memory/libdatasrc_memory.la +rdata_reader_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la rdata_reader_bench_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la + + rrset_render_bench_SOURCES = rrset_render_bench.cc + rrset_render_bench_LDADD = $(top_builddir)/src/lib/datasrc/memory/libdatasrc_memory.la + rrset_render_bench_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la