BIND 10 trac2367, updated. d6127c5891f381ac5126ae7532bea27a2faf11c7 [trac2367] don't do repeat SUBDIRs and various cleanups

[BIND 10 source code commits]

The branch, trac2367 has been updated
       via  d6127c5891f381ac5126ae7532bea27a2faf11c7 (commit)
      from  45c244768f696fc74230bec5ed9043e1bc8f9ac1 (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 d6127c5891f381ac5126ae7532bea27a2faf11c7
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Fri Aug 30 08:19:30 2013 -0400

    [trac2367] don't do repeat SUBDIRs and various cleanups
    
    Use several make variables so SUBDIRs weren't repeated for
    common dependencies.
    Identify some more internal dependencies used for tests.

-----------------------------------------------------------------------

Summary of changes:
 m4macros/ax_bind10_components.m4 |    2 ++
 src/bin/Makefile.am              |   39 +++++++++++++++++++-------------------
 src/lib/Makefile.am              |   35 ++++++++++++++++++++++++++--------
 src/lib/python/isc/Makefile.am   |   34 +++++++++++++++++++++++----------
 4 files changed, 72 insertions(+), 38 deletions(-)

-----------------------------------------------------------------------
diff --git a/m4macros/ax_bind10_components.m4 b/m4macros/ax_bind10_components.m4
index 6cbe375..d71255d 100644
--- a/m4macros/ax_bind10_components.m4
+++ b/m4macros/ax_bind10_components.m4
@@ -58,6 +58,8 @@ AC_ARG_ENABLE(auth,
    if test "$components_selection" = "all" -o \
             "$components_selection" = "reallyall" ; then
      enable_auth=yes
+     # loadzone is used for auth test files
+     enable_loadzone=yes
    fi
 ])
 
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f46a62f..bb8781e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,47 +1,46 @@
-SUBDIRS = bind10 bindctl cfgmgr msgq cmdctl \
-	usermgr tests \
-	sockcreator dbutil sysinfo
-
 if ENABLE_DHCP
-SUBDIRS += dhcp4 dhcp6 d2
+dhcp = dhcp4 dhcp6 d2
 endif
 
 if ENABLE_AUTH
-SUBDIRS += auth
+auth = auth
+# loadzone is used for generating test files for auth
+loadzone = loadzone
 endif
 
 if ENABLE_DDNS
-SUBDIRS += ddns
+ddns = ddns
 endif
 
 if ENABLE_LOADZONE
-SUBDIRS += loadzone
+loadzone = loadzone
+endif
+
+if ENABLE_RESOLVER
+# Build resolver only with --enable-experimental-resolver
+resolver = resolver
 endif
 
 if ENABLE_STATISTICS
-SUBDIRS += stats
+stats = stats
 endif
 
 if ENABLE_XFRIN
-SUBDIRS += xfrin
+xfrin = xfrin
 endif
 
 if ENABLE_XFROUT
-SUBDIRS += xfrout
+xfrout = xfrout
 endif
 
 if ENABLE_ZONEMGR
-SUBDIRS += zonemgr
+zonemgr = zonemgr
 endif
 
-if ENABLE_RESOLVER
-# Build resolver only with --enable-experimental-resolver
-SUBDIRS += resolver
-endif
-
-if ENABLE_STATISTICS
-SUBDIRS += stats
-endif
+SUBDIRS = bind10 bindctl cfgmgr $(ddns) $(loadzone) msgq cmdctl \
+        $(auth) $(xfrin) \
+        $(xfrout) usermgr $(zonemgr) $(stats) tests $(resolver) \
+	sockcreator $(dhcp) dbutil sysinfo
 
 if USE_SHARED_MEMORY
 # Build the memory manager only if we have shared memory.
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0390df2..271b86b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,25 +1,44 @@
-SUBDIRS = exceptions util log hooks cryptolink cc config \
-          asiolink testutils \
-          python statistics
-
 if ENABLE_LIBDNS
-SUBDIRS += dns
+libdns = dns
 endif
 
 if ENABLE_AUTH
+asiodns = asiodns
 # nsas is used by query_bench
-SUBDIRS += dns acl nsas bench asiodns datasrc server_common xfr
+nsas = nsas
+acl = acl
+auth = bench xfr
+datasrc = datasrc
+server_common = server_common
 endif
 
 if ENABLE_LIBDHCP
 # asiodns is used by b10-dhcp-ddns
-SUBDIRS += asiodns dhcp dhcp_ddns dhcpsrv
+asiodns = asiodns
+libdhcp = dhcp dhcp_ddns dhcpsrv
 endif
 
 if ENABLE_RESOLVER
-SUBDIRS += nsas asiodns acl server_common cache resolve
+asiodns = asiodns
+nsas = nsas
+acl = acl
+server_common = server_common
+resolver = cache resolve
+endif
+
+if ENABLE_XFRIN
+datasrc = datasrc
 endif
 
+if ENABLE_XFRIN
+acl = acl
+endif
+
+SUBDIRS = exceptions util log hooks cryptolink dns cc config \
+          $(acl) $(auth) \
+          asiolink $(asiodns) $(nsas) $(resolver) testutils \
+          $(datasrc) $(server_common) python $(libdhcp)
+
 if ENABLE_STATISTICS
 SUBDIRS += statistics
 endif
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index a50a2d1..de18a94 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/src/lib/python/isc/Makefile.am
@@ -1,4 +1,27 @@
-SUBDIRS = util cc config log net testutils bind10
+
+if ENABLE_DNS_LIBRARIES
+# ddns module uses xfrin
+acl = acl
+ddns = acl ddns
+datasrc = datasrc
+notify = notify
+server_common = server_common
+xfrin = xfrin
+endif
+
+if ENABLE_XFRIN
+datasrc = datasrc
+notify = notify
+server_common = server_common
+xfrin = xfrin
+endif
+
+if ENABLE_XFROUT
+acl = acl
+endif
+
+SUBDIRS = util cc config log net testutils bind10 $(datasrc) $(xfrin)
+SUBDIRS += $(acl) $(ddns) $(server_common) $(notify)
 SUBDIRS += log_messages sysinfo
 
 if USE_SHARED_MEMORY
@@ -10,19 +33,10 @@ if ENABLE_LIBDNS
 SUBDIRS += dns
 endif
 
-if ENABLE_DNS_LIBRARIES
-# ddns module uses xfrin
-SUBDIRS += acl datasrc xfrin ddns notify server_common
-endif
-
 if ENABLE_STATISTICS
 SUBDIRS += statistics
 endif
 
-if ENABLE_XFRIN
-SUBDIRS += xfrin
-endif
-
 python_PYTHON = __init__.py
 
 pythondir = $(pyexecdir)/isc