From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Tue, 28 Aug 2012 09:32:00 +0000 (+0200)
Subject: Merge #2096
X-Git-Tag: trac2351_base~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e500e577f4fd8d6be953c15561f20c5ef1a784e;p=thirdparty%2Fkea.git

Merge #2096

Conflicts:
	src/lib/datasrc/memory/Makefile.am
---

6e500e577f4fd8d6be953c15561f20c5ef1a784e
diff --cc src/lib/datasrc/memory/Makefile.am
index 8e7b03ed52,16e7fd0751..e0f49cc4c1
--- a/src/lib/datasrc/memory/Makefile.am
+++ b/src/lib/datasrc/memory/Makefile.am
@@@ -10,7 -10,7 +10,9 @@@ CLEANFILES = *.gcno *.gcda datasrc_mess
  
  noinst_LTLIBRARIES = libdatasrc_memory.la
  
- libdatasrc_memory_la_SOURCES = rdata_encoder.h rdata_encoder.cc
- libdatasrc_memory_la_SOURCES += domaintree.h
+ libdatasrc_memory_la_SOURCES = \
+ 	rdata_serialization.h rdata_serialization.cc \
+ 	domaintree.h
 +libdatasrc_memory_la_SOURCES += zone_data.h
 +libdatasrc_memory_la_SOURCES += zone_table.h zone_table.cc
+ EXTRA_DIST  = rdata_serialization_priv.cc
diff --cc src/lib/datasrc/memory/tests/Makefile.am
index 2275d84b9c,5f1a40c32f..6195cc700a
--- a/src/lib/datasrc/memory/tests/Makefile.am
+++ b/src/lib/datasrc/memory/tests/Makefile.am
@@@ -18,9 -18,8 +18,9 @@@ if HAVE_GTES
  TESTS += run_unittests
  
  run_unittests_SOURCES = run_unittests.cc
- run_unittests_SOURCES += rdata_encoder_unittest.cc
+ run_unittests_SOURCES += rdata_serialization_unittest.cc
  run_unittests_SOURCES += domaintree_unittest.cc
 +run_unittests_SOURCES += zone_table_unittest.cc
  
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)