BIND 10 trac745, updated. 313464eed2b54281b8b2357002cd7dfb9231ddf6 [trac745] Update Makefile as a result of problems encountered in make distcheck
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 5 11:14:00 UTC 2011
The branch, trac745 has been updated
via 313464eed2b54281b8b2357002cd7dfb9231ddf6 (commit)
from 4fff42d6c9ae24effcae3f6eaa73a8a4eda5a38f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 313464eed2b54281b8b2357002cd7dfb9231ddf6
Author: Stephen Morris <stephen at isc.org>
Date: Thu May 5 12:12:49 2011 +0100
[trac745] Update Makefile as a result of problems encountered in make distcheck
Also renamed the message file extension to ".mes" to conform to other
messages files and updated the associated documentation as well.
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/README | 2 +-
src/lib/nsas/Makefile.am | 34 ++++++++++++++++++++--------
src/lib/nsas/{nsasdef.msg => nsasdef.mes} | 0
3 files changed, 25 insertions(+), 11 deletions(-)
rename src/lib/nsas/{nsasdef.msg => nsasdef.mes} (100%)
-----------------------------------------------------------------------
diff --git a/src/lib/log/README b/src/lib/log/README
index ed11b5b..dad94a3 100644
--- a/src/lib/log/README
+++ b/src/lib/log/README
@@ -55,7 +55,7 @@ The steps in using the system are:
mnemonic for the message, typically 6-12 characters long - and a message.
The file is described in more detail below.
- Ideally the file should have a file type of ".msg".
+ Ideally the file should have a file type of ".mes".
2. Run it through the message compiler to produce the .h and .cc files. It
is intended that this step be included in the build process. However,
diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index c5a0da9..3ecbca7 100644
--- a/src/lib/nsas/Makefile.am
+++ b/src/lib/nsas/Makefile.am
@@ -9,25 +9,35 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/nsas -I$(top_builddir)/src/lib/nsas
AM_CPPFLAGS += $(SQLITE_CFLAGS)
AM_CXXFLAGS = $(B10_CXXFLAGS)
-# Some versions of GCC warn about some versions of Boost regarding
-# missing initializer for members in its posix_time.
+# Some versions of GCC warn about some versions of Boost regarding missing
+# initializer for members in its posix_time.
# https://svn.boost.org/trac/boost/ticket/3477
# But older GCC compilers don't have the flag.
AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
-if USE_CLANGPP
# clang++ complains about unused function parameters in some boost header
# files.
+if USE_CLANGPP
AM_CXXFLAGS += -Wno-unused-parameter
endif
-# Build the logging source files from the message definition
-nsasdef.h nsasdef.cc: nsasdef.msg
- $(top_builddir)/src/lib/log/compiler/message nsasdef.msg
+# Define rule to build logging source files from message file
+nsasdef.h nsasdef.cc: nsasdef.mes
+ $(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/nsas/nsasdef.mes
+# What is being built.
lib_LTLIBRARIES = libnsas.la
-libnsas_la_SOURCES = nsasdef.h nsasdef.cc
-libnsas_la_SOURCES += address_entry.h address_entry.cc
+
+# 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
+# are a dependency of the library (so will be created from the message file
+# 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 = nsasdef.h nsasdef.cc
+
+# Library sources. The generated files will not be in the distribution.
+libnsas_la_SOURCES = address_entry.h address_entry.cc
libnsas_la_SOURCES += asiolink.h
libnsas_la_SOURCES += hash.cc hash.h
libnsas_la_SOURCES += hash_deleter.h
@@ -44,6 +54,10 @@ libnsas_la_SOURCES += fetchable.h
libnsas_la_SOURCES += address_request_callback.h
libnsas_la_SOURCES += glue_hints.h glue_hints.cc
-EXTRA_DIST = nsasdef.msg
+nodist_libnsas_la_SOURCES = nsasdef.h nsasdef.cc
+
+# The message file should be in the distribution.
+EXTRA_DIST = nsasdef.mes
-CLEANFILES = *.gcno *.gcda
+# Make sure that the generated files are got rid of in a clean operation
+CLEANFILES = *.gcno *.gcda nsasdef.h nsasdef.cc
diff --git a/src/lib/nsas/nsasdef.mes b/src/lib/nsas/nsasdef.mes
new file mode 100644
index 0000000..547e8e7
--- /dev/null
+++ b/src/lib/nsas/nsasdef.mes
@@ -0,0 +1,61 @@
+# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+$PREFIX NSAS_
+$NAMESPACE isc::nsas
+
+INVRESPSTR queried for %s but got invalid response
++ This message indicates an internal error in the nameserver address store
++ component (NSAS) of the resolver. The NSAS made a query for a RR for the
++ specified nameserver but received an invalid response. Either the success
++ function was called without a DNS message or the message was invalid on some
++ way. (In the latter case, the error should have been picked up elsewhere in
++ the processing logic, hence the raising of the error here.)
+
+INVRESPTC queried for %s RR of type/class %s/%s, received response %s/%s
++ This message indicates an internal error in the nameserver address store
++ component (NSAS) of the resolver. The NSAS made a query for the given RR
++ type and class, but instead received an answer with the given type and class.
+
+LOOKUPCANCEL lookup for zone %s has been cancelled
++ A debug message, this is output when a NSAS (nameserver address store -
++ part of the resolver) lookup for a zone has been cancelled.
+
+LOOKUPZONE searching NSAS for nameservers for zone %s
++ A debug message, this is output when a call is made to the nameserver address
++ store (part of the resolver) to obtain the nameservers for the specified zone.
+
+NSADDR asking resolver to obtain A and AAAA records for %s
++ A debug message, the NSAS (nameserver address store - part of the resolver) is
++ making a callback into the resolver to retrieve the address records for the
++ specified nameserver.
+
+NSLKUPFAIL failed to lookup any %s for %s
++ A debug message, the NSAS (nameserver address store - part of the resolver)
++ has been unable to retrieve the specified resource record for the specified
++ nameserver. This is not necessarily a problem - the nameserver may be
++ unreachable, in which case the NSAS will try other nameservers in the zone.
+
+NSLKUPSUCC found address %s for %s
++ A debug message, the NSAS (nameserver address store - part of the resolver)
++ has retrieved the given address for the specified nameserver through an
++ external query.
+
+SETRTT reporting RTT for %s as %d; new value is now %d
++ A NSAS (nameserver address store - part of the resolver) debug message
++ reporting the round-trip time (RTT) for a query made to the specified
++ nameserver. The RTT has been updated using the value given and the new RTT is
++ displayed. (The RTT is subject to a calculation that damps out sudden
++ changes. As a result, the new RTT is not necessarily equal to the RTT
++ reported.)
diff --git a/src/lib/nsas/nsasdef.msg b/src/lib/nsas/nsasdef.msg
deleted file mode 100644
index 547e8e7..0000000
--- a/src/lib/nsas/nsasdef.msg
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-$PREFIX NSAS_
-$NAMESPACE isc::nsas
-
-INVRESPSTR queried for %s but got invalid response
-+ This message indicates an internal error in the nameserver address store
-+ component (NSAS) of the resolver. The NSAS made a query for a RR for the
-+ specified nameserver but received an invalid response. Either the success
-+ function was called without a DNS message or the message was invalid on some
-+ way. (In the latter case, the error should have been picked up elsewhere in
-+ the processing logic, hence the raising of the error here.)
-
-INVRESPTC queried for %s RR of type/class %s/%s, received response %s/%s
-+ This message indicates an internal error in the nameserver address store
-+ component (NSAS) of the resolver. The NSAS made a query for the given RR
-+ type and class, but instead received an answer with the given type and class.
-
-LOOKUPCANCEL lookup for zone %s has been cancelled
-+ A debug message, this is output when a NSAS (nameserver address store -
-+ part of the resolver) lookup for a zone has been cancelled.
-
-LOOKUPZONE searching NSAS for nameservers for zone %s
-+ A debug message, this is output when a call is made to the nameserver address
-+ store (part of the resolver) to obtain the nameservers for the specified zone.
-
-NSADDR asking resolver to obtain A and AAAA records for %s
-+ A debug message, the NSAS (nameserver address store - part of the resolver) is
-+ making a callback into the resolver to retrieve the address records for the
-+ specified nameserver.
-
-NSLKUPFAIL failed to lookup any %s for %s
-+ A debug message, the NSAS (nameserver address store - part of the resolver)
-+ has been unable to retrieve the specified resource record for the specified
-+ nameserver. This is not necessarily a problem - the nameserver may be
-+ unreachable, in which case the NSAS will try other nameservers in the zone.
-
-NSLKUPSUCC found address %s for %s
-+ A debug message, the NSAS (nameserver address store - part of the resolver)
-+ has retrieved the given address for the specified nameserver through an
-+ external query.
-
-SETRTT reporting RTT for %s as %d; new value is now %d
-+ A NSAS (nameserver address store - part of the resolver) debug message
-+ reporting the round-trip time (RTT) for a query made to the specified
-+ nameserver. The RTT has been updated using the value given and the new RTT is
-+ displayed. (The RTT is subject to a calculation that damps out sudden
-+ changes. As a result, the new RTT is not necessarily equal to the RTT
-+ reported.)
More information about the bind10-changes
mailing list