BIND 10 trac2198_2, updated. d042cd04c0784641738a0f06e5a6b193b433d39f [2198] Remove dependency on libb10-util in src/lib/util/unittests/

[BIND 10 source code commits]

The branch, trac2198_2 has been updated
       via  d042cd04c0784641738a0f06e5a6b193b433d39f (commit)
      from  c0d25c429a4f2026bb97b9e013730b8f265862e6 (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 d042cd04c0784641738a0f06e5a6b193b433d39f
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Oct 10 20:11:09 2012 +0530

    [2198] Remove dependency on libb10-util in src/lib/util/unittests/

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

Summary of changes:
 src/lib/util/Makefile.am           |    2 +-
 src/lib/util/unittests/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 23d140a..99b54eb 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -1,5 +1,5 @@
 # InterprocessSyncFile has a dependency on isc::util::thread::Mutex
-SUBDIRS = threads . io unittests tests pyunittests python
+SUBDIRS = io unittests threads . tests pyunittests python
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index 451ab4e..6caa6bf 100644
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -20,8 +20,7 @@ if HAVE_GTEST
 libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
 endif
 
-libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libb10-util.la
-libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
+libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/io/libb10-util-io.la
 libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 
 CLEANFILES = *.gcno *.gcda