BIND 10 trac2342, updated. 1cee186c837d355ef28b00773bbb145e75444b85 [2342] Temporarily moved duid.{h, cc} from libdhcp++ to libdhcp_srv.

[BIND 10 source code commits]

The branch, trac2342 has been updated
       via  1cee186c837d355ef28b00773bbb145e75444b85 (commit)
      from  b0ad16d99eb0bc2148976a31c4dbf7ff0ed5516a (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 1cee186c837d355ef28b00773bbb145e75444b85
Author: Marcin Siodelski <marcin at isc.org>
Date:   Fri Nov 9 13:55:16 2012 +0100

    [2342] Temporarily moved duid.{h,cc} from libdhcp++ to libdhcp_srv.
    
    Having duid.{h, cc} in libdhcp++ causes dependency between two libraries.
    Due to this dependency multi-threaded build fails because libs are created
    by different threads simultaneously and race condition occurs. Libraries
    should be moved to separate folders and have separate makefiles. This
    complies with BIND10 structure and will make this issue goe away.

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

Summary of changes:
 src/lib/dhcp/Makefile.am       |    5 ++---
 src/lib/dhcp/tests/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index 4761b24..8cede9b 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -19,7 +19,6 @@ CLEANFILES = *.gcno *.gcda
 lib_LTLIBRARIES = libb10-dhcp++.la libb10-dhcpsrv.la
 libb10_dhcp___la_SOURCES  =
 libb10_dhcp___la_SOURCES += dhcp6.h dhcp4.h
-libb10_dhcp___la_SOURCES += duid.cc duid.h
 libb10_dhcp___la_SOURCES += iface_mgr.cc iface_mgr.h
 libb10_dhcp___la_SOURCES += iface_mgr_bsd.cc
 libb10_dhcp___la_SOURCES += iface_mgr_linux.cc
@@ -41,6 +40,7 @@ libb10_dhcp___la_LDFLAGS  = -no-undefined -version-info 2:0:0
 
 libb10_dhcpsrv_la_SOURCES  = cfgmgr.cc cfgmgr.h
 libb10_dhcpsrv_la_SOURCES += addr_utilities.cc addr_utilities.h
+libb10_dhcpsrv_la_SOURCES += duid.cc duid.h
 libb10_dhcpsrv_la_SOURCES += lease_mgr.cc lease_mgr.h
 libb10_dhcpsrv_la_SOURCES += lease_mgr_factory.cc lease_mgr_factory.h
 if HAVE_MYSQL
@@ -52,8 +52,7 @@ libb10_dhcpsrv_la_SOURCES += triplet.h
 
 libb10_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
 libb10_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+libb10_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
 libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/util/libb10-util.la
 libb10_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 2:0:0
 if HAVE_MYSQL
diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am
index 4b9beb6..99548f6 100644
--- a/src/lib/dhcp/tests/Makefile.am
+++ b/src/lib/dhcp/tests/Makefile.am
@@ -29,7 +29,6 @@ TESTS =
 if HAVE_GTEST
 TESTS += libdhcp++_unittests libdhcpsrv_unittests
 libdhcp___unittests_SOURCES  = run_unittests.cc
-libdhcp___unittests_SOURCES += duid_unittest.cc
 libdhcp___unittests_SOURCES += iface_mgr_unittest.cc
 libdhcp___unittests_SOURCES += libdhcp++_unittest.cc
 libdhcp___unittests_SOURCES += option4_addrlst_unittest.cc
@@ -48,6 +47,7 @@ libdhcp___unittests_CXXFLAGS = $(AM_CXXFLAGS)
 libdhcpsrv_unittests_SOURCES  = run_unittests.cc
 libdhcpsrv_unittests_SOURCES += addr_utilities_unittest.cc
 libdhcpsrv_unittests_SOURCES += cfgmgr_unittest.cc
+libdhcpsrv_unittests_SOURCES += duid_unittest.cc
 libdhcpsrv_unittests_SOURCES += lease_mgr_factory_unittest.cc
 libdhcpsrv_unittests_SOURCES += lease_mgr_unittest.cc
 if HAVE_MYSQL