[trac1037] Rename resolvedef.mes resolve_messages.mes

3 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index 94ad371e44..ceccce817b 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS += $(SQLITE_CFLAGS)
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 # Define rule to build logging source files from message file
-resolvedef.h resolvedef.cc: resolvedef.mes
-	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/resolve/resolvedef.mes
+resolve_messages.h resolve_messages.cc: resolve_messages.mes
+	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/resolve/resolve_messages.mes
 
 # Tell Automake that the nsasdef.{cc,h} source files are created in the build
 # process, so it must create these before doing anything else.  Although they
@@ -17,9 +17,9 @@ resolvedef.h resolvedef.cc: resolvedef.mes
 # anyway), there is no guarantee as to exactly _when_ in the build they will be
 # created.  As the .h file is included in other sources file (so must be
 # present when they are compiled), the safest option is to create it first.
-BUILT_SOURCES = resolvedef.h resolvedef.cc
+BUILT_SOURCES = resolve_messages.h resolve_messages.cc
 
-CLEANFILES = *.gcno *.gcda resolvedef.cc resolvedef.h
+CLEANFILES = *.gcno *.gcda resolve_messages.cc resolve_messages.h
 
 lib_LTLIBRARIES = libresolve.la
 libresolve_la_SOURCES = resolve.h resolve.cc
@@ -29,14 +29,14 @@ libresolve_la_SOURCES += resolver_callback.h resolver_callback.cc
 libresolve_la_SOURCES += response_classifier.cc response_classifier.h
 libresolve_la_SOURCES += recursive_query.cc recursive_query.h
 
-nodist_libresolve_la_SOURCES = resolvedef.h resolvedef.cc
+nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc
 
 libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la
 libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 libresolve_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la
 
 # The message file should be in the distribution.
-EXTRA_DIST = resolvedef.mes
+EXTRA_DIST = resolve_messages.mes
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)
diff --git a/src/lib/resolve/resolve_log.h b/src/lib/resolve/resolve_log.h
index 89d23c6c33..1f2869ee10 100644
--- a/src/lib/resolve/resolve_log.h
+++ b/src/lib/resolve/resolve_log.h
@@ -16,7 +16,7 @@
 #define __RESOLVE_LOG__H
 
 #include <log/macros.h>
-#include "resolvedef.h"
+#include "resolve_messages.h"
 
 namespace isc {
 namespace resolve {
diff --git a/src/lib/resolve/resolvedef.mes b/src/lib/resolve/resolve_messages.mes
index 61870a6651..61870a6651 100644
--- a/src/lib/resolve/resolvedef.mes
+++ b/src/lib/resolve/resolve_messages.mes