Parcourir la source

[3394] Renamed Kea libraries from libb10-something to libkea-something.

Marcin Siodelski il y a 11 ans
Parent
commit
7187919c2f
53 fichiers modifiés avec 558 ajouts et 558 suppressions
  1. 1 1
      doc/guide/bind10-guide.xml
  2. 12 12
      src/bin/d2/Makefile.am
  3. 12 12
      src/bin/d2/tests/Makefile.am
  4. 10 10
      src/bin/dhcp4/Makefile.am
  5. 10 10
      src/bin/dhcp4/tests/Makefile.am
  6. 10 10
      src/bin/dhcp6/Makefile.am
  7. 10 10
      src/bin/dhcp6/tests/Makefile.am
  8. 2 2
      src/bin/sockcreator/Makefile.am
  9. 1 1
      src/bin/sockcreator/tests/Makefile.am
  10. 5 5
      src/hooks/dhcp/user_chk/Makefile.am
  11. 7 7
      src/hooks/dhcp/user_chk/tests/Makefile.am
  12. 17 17
      src/lib/asiodns/Makefile.am
  13. 6 6
      src/lib/asiodns/tests/Makefile.am
  14. 25 25
      src/lib/asiolink/Makefile.am
  15. 3 3
      src/lib/asiolink/tests/Makefile.am
  16. 7 7
      src/lib/cc/Makefile.am
  17. 3 3
      src/lib/cc/tests/Makefile.am
  18. 9 9
      src/lib/config/Makefile.am
  19. 4 4
      src/lib/config/tests/Makefile.am
  20. 5 5
      src/lib/cryptolink/Makefile.am
  21. 3 3
      src/lib/cryptolink/tests/Makefile.am
  22. 49 49
      src/lib/dhcp/Makefile.am
  23. 7 7
      src/lib/dhcp/tests/Makefile.am
  24. 25 25
      src/lib/dhcp_ddns/Makefile.am
  25. 9 9
      src/lib/dhcp_ddns/tests/Makefile.am
  26. 44 44
      src/lib/dhcpsrv/Makefile.am
  27. 9 9
      src/lib/dhcpsrv/tests/Makefile.am
  28. 51 51
      src/lib/dns/Makefile.am
  29. 6 6
      src/lib/dns/benchmarks/Makefile.am
  30. 32 32
      src/lib/dns/python/Makefile.am
  31. 3 3
      src/lib/dns/tests/Makefile.am
  32. 4 4
      src/lib/exceptions/Makefile.am
  33. 1 1
      src/lib/exceptions/tests/Makefile.am
  34. 23 23
      src/lib/hooks/Makefile.am
  35. 1 1
      src/lib/hooks/hooks_user.dox
  36. 5 5
      src/lib/hooks/tests/Makefile.am
  37. 34 34
      src/lib/log/Makefile.am
  38. 3 3
      src/lib/log/compiler/Makefile.am
  39. 7 7
      src/lib/log/interprocess/Makefile.am
  40. 3 3
      src/lib/log/interprocess/tests/Makefile.am
  41. 18 18
      src/lib/log/tests/Makefile.am
  42. 4 4
      src/lib/python/isc/log/Makefile.am
  43. 1 1
      src/lib/python/isc/util/cio/Makefile.am
  44. 7 7
      src/lib/testutils/Makefile.am
  45. 23 23
      src/lib/util/Makefile.am
  46. 6 6
      src/lib/util/io/Makefile.am
  47. 1 1
      src/lib/util/pyunittests/Makefile.am
  48. 3 3
      src/lib/util/tests/Makefile.am
  49. 5 5
      src/lib/util/threads/Makefile.am
  50. 1 1
      src/lib/util/threads/tests/Makefile.am
  51. 3 3
      src/lib/util/unittests/Makefile.am
  52. 4 4
      tests/tools/perfdhcp/Makefile.am
  53. 4 4
      tests/tools/perfdhcp/tests/Makefile.am

+ 1 - 1
doc/guide/bind10-guide.xml

@@ -857,7 +857,7 @@ as a dependency earlier -->
 	    If you do not run <command>ldconfig</command> where it is
 	    required, you may see errors like the following:
             <screen>
-	      program: error while loading shared libraries: libb10-something.so.1:
+	      program: error while loading shared libraries: libkea-something.so.1:
 	      cannot open shared object file: No such file or directory
 	    </screen>
 	  </para>

+ 12 - 12
src/bin/d2/Makefile.am

@@ -72,18 +72,18 @@ b10_dhcp_ddns_SOURCES += state_model.cc state_model.h
 nodist_b10_dhcp_ddns_SOURCES = d2_messages.h d2_messages.cc
 EXTRA_DIST += d2_messages.mes
 
-b10_dhcp_ddns_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
+b10_dhcp_ddns_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 b10_dhcp_ddnsdir = $(pkgdatadir)
 b10_dhcp_ddns_DATA = dhcp-ddns.spec

+ 12 - 12
src/bin/d2/tests/Makefile.am

@@ -93,18 +93,18 @@ nodist_d2_unittests_SOURCES = ../d2_messages.h ../d2_messages.cc
 d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 d2_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 d2_unittests_LDADD = $(GTEST_LDADD)
-d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 endif
 

+ 10 - 10
src/bin/dhcp4/Makefile.am

@@ -58,16 +58,16 @@ b10_dhcp4_SOURCES += dhcp4_srv.cc dhcp4_srv.h
 nodist_b10_dhcp4_SOURCES = dhcp4_messages.h dhcp4_messages.cc
 EXTRA_DIST += dhcp4_messages.mes
 
-b10_dhcp4_LDADD  = $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
+b10_dhcp4_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 b10_dhcp4dir = $(pkgdatadir)
 b10_dhcp4_DATA = dhcp4.spec

+ 10 - 10
src/bin/dhcp4/tests/Makefile.am

@@ -95,17 +95,17 @@ nodist_dhcp4_unittests_SOURCES += marker_file.h test_libraries.h
 dhcp4_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 dhcp4_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 dhcp4_unittests_LDADD = $(GTEST_LDADD)
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

+ 10 - 10
src/bin/dhcp6/Makefile.am

@@ -60,16 +60,16 @@ b10_dhcp6_SOURCES += dhcp6_srv.cc dhcp6_srv.h
 nodist_b10_dhcp6_SOURCES = dhcp6_messages.h dhcp6_messages.cc
 EXTRA_DIST += dhcp6_messages.mes
 
-b10_dhcp6_LDADD  = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
+b10_dhcp6_LDADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 b10_dhcp6dir = $(pkgdatadir)
 b10_dhcp6_DATA = dhcp6.spec

+ 10 - 10
src/bin/dhcp6/tests/Makefile.am

@@ -94,17 +94,17 @@ dhcp6_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 dhcp6_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 dhcp6_unittests_LDADD = $(GTEST_LDADD)
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

+ 2 - 2
src/bin/sockcreator/Makefile.am

@@ -32,5 +32,5 @@ endif
 pkglibexec_PROGRAMS = b10-sockcreator
 
 b10_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc
-b10_sockcreator_LDADD  = $(top_builddir)/src/lib/util/io/libb10-util-io.la
-b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+b10_sockcreator_LDADD  = $(top_builddir)/src/lib/util/io/libkea-util-io.la
+b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

+ 1 - 1
src/bin/sockcreator/tests/Makefile.am

@@ -22,7 +22,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD  = $(GTEST_LDADD)
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

+ 5 - 5
src/hooks/dhcp/user_chk/Makefile.am

@@ -57,11 +57,11 @@ libdhcp_user_chk_la_LDFLAGS  += -avoid-version -export-dynamic -module
 # convenience archive, resulting in shared modules
 libdhcp_user_chk_la_LDFLAGS  += -rpath /nowhere
 libdhcp_user_chk_la_LIBADD  =
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/hooks/libb10-hooks.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/log/libb10-log.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/util/libb10-util.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/util/threads/libb10-threads.la
+libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 
 
 if USE_CLANGPP

+ 7 - 7
src/hooks/dhcp/user_chk/tests/Makefile.am

@@ -64,13 +64,13 @@ if USE_CLANGPP
 libdhcp_user_chk_unittests_CXXFLAGS += -Wno-unused-parameter
 endif
 
-libdhcp_user_chk_unittests_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+libdhcp_user_chk_unittests_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_user_chk_unittests_LDADD += ${BOTAN_LIBS} ${BOTAN_RPATH}
 libdhcp_user_chk_unittests_LDADD += $(GTEST_LDADD)
 endif

+ 17 - 17
src/lib/asiodns/Makefile.am

@@ -19,25 +19,25 @@ s-messages: asiodns_messages.mes
 
 BUILT_SOURCES = asiodns_messages.h asiodns_messages.cc
 
-lib_LTLIBRARIES = libb10-asiodns.la
-libb10_asiodns_la_SOURCES = dns_answer.h
-libb10_asiodns_la_SOURCES += asiodns.h
-libb10_asiodns_la_SOURCES += dns_lookup.h
-libb10_asiodns_la_SOURCES += dns_server.h
-libb10_asiodns_la_SOURCES += dns_service.cc dns_service.h
-libb10_asiodns_la_SOURCES += tcp_server.cc tcp_server.h
-libb10_asiodns_la_SOURCES += udp_server.cc udp_server.h
-libb10_asiodns_la_SOURCES += sync_udp_server.cc sync_udp_server.h
-libb10_asiodns_la_SOURCES += io_fetch.cc io_fetch.h
-libb10_asiodns_la_SOURCES += logger.h logger.cc
-
-nodist_libb10_asiodns_la_SOURCES = asiodns_messages.cc asiodns_messages.h
+lib_LTLIBRARIES = libkea-asiodns.la
+libkea_asiodns_la_SOURCES = dns_answer.h
+libkea_asiodns_la_SOURCES += asiodns.h
+libkea_asiodns_la_SOURCES += dns_lookup.h
+libkea_asiodns_la_SOURCES += dns_server.h
+libkea_asiodns_la_SOURCES += dns_service.cc dns_service.h
+libkea_asiodns_la_SOURCES += tcp_server.cc tcp_server.h
+libkea_asiodns_la_SOURCES += udp_server.cc udp_server.h
+libkea_asiodns_la_SOURCES += sync_udp_server.cc sync_udp_server.h
+libkea_asiodns_la_SOURCES += io_fetch.cc io_fetch.h
+libkea_asiodns_la_SOURCES += logger.h logger.cc
+
+nodist_libkea_asiodns_la_SOURCES = asiodns_messages.cc asiodns_messages.h
 
 EXTRA_DIST = asiodns_messages.mes
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)
-libb10_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
-libb10_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
-libb10_asiodns_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libb10_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
+libkea_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
+libkea_asiodns_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la

+ 6 - 6
src/lib/asiodns/tests/Makefile.am

@@ -28,13 +28,13 @@ run_unittests_SOURCES += io_fetch_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 
 run_unittests_LDADD  = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 

+ 25 - 25
src/lib/asiolink/Makefile.am

@@ -13,33 +13,33 @@ CLEANFILES = *.gcno *.gcda
 # gcc's unused-parameter warning, which would make the build fail
 # with -Werror (our default setting).
 
-lib_LTLIBRARIES = libb10-asiolink.la
-
-libb10_asiolink_la_LDFLAGS = -no-undefined -version-info 1:0:1
-
-libb10_asiolink_la_SOURCES  = asiolink.h
-libb10_asiolink_la_SOURCES += dummy_io_cb.h
-libb10_asiolink_la_SOURCES += interval_timer.cc interval_timer.h
-libb10_asiolink_la_SOURCES += io_address.cc io_address.h
-libb10_asiolink_la_SOURCES += io_asio_socket.h
-libb10_asiolink_la_SOURCES += io_endpoint.cc io_endpoint.h
-libb10_asiolink_la_SOURCES += io_error.h
-libb10_asiolink_la_SOURCES += io_message.h
-libb10_asiolink_la_SOURCES += io_service.h io_service.cc
-libb10_asiolink_la_SOURCES += io_socket.h io_socket.cc
-libb10_asiolink_la_SOURCES += simple_callback.h
-libb10_asiolink_la_SOURCES += tcp_endpoint.h
-libb10_asiolink_la_SOURCES += tcp_socket.h
-libb10_asiolink_la_SOURCES += udp_endpoint.h
-libb10_asiolink_la_SOURCES += udp_socket.h
-libb10_asiolink_la_SOURCES += local_socket.h local_socket.cc
+lib_LTLIBRARIES = libkea-asiolink.la
+
+libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 1:0:1
+
+libkea_asiolink_la_SOURCES  = asiolink.h
+libkea_asiolink_la_SOURCES += dummy_io_cb.h
+libkea_asiolink_la_SOURCES += interval_timer.cc interval_timer.h
+libkea_asiolink_la_SOURCES += io_address.cc io_address.h
+libkea_asiolink_la_SOURCES += io_asio_socket.h
+libkea_asiolink_la_SOURCES += io_endpoint.cc io_endpoint.h
+libkea_asiolink_la_SOURCES += io_error.h
+libkea_asiolink_la_SOURCES += io_message.h
+libkea_asiolink_la_SOURCES += io_service.h io_service.cc
+libkea_asiolink_la_SOURCES += io_socket.h io_socket.cc
+libkea_asiolink_la_SOURCES += simple_callback.h
+libkea_asiolink_la_SOURCES += tcp_endpoint.h
+libkea_asiolink_la_SOURCES += tcp_socket.h
+libkea_asiolink_la_SOURCES += udp_endpoint.h
+libkea_asiolink_la_SOURCES += udp_socket.h
+libkea_asiolink_la_SOURCES += local_socket.h local_socket.cc
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)
-libb10_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
-libb10_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
-libb10_asiolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
+libkea_asiolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 # IOAddress is sometimes used in user-library code
-libb10_asiolink_includedir = $(pkgincludedir)/asiolink
-libb10_asiolink_include_HEADERS = io_address.h
+libkea_asiolink_includedir = $(pkgincludedir)/asiolink
+libkea_asiolink_include_HEADERS = io_address.h

+ 3 - 3
src/lib/asiolink/tests/Makefile.am

@@ -39,10 +39,10 @@ run_unittests_SOURCES += dummy_io_callback_unittest.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 
-run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(GTEST_LDADD)
 
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)

+ 7 - 7
src/lib/cc/Makefile.am

@@ -14,13 +14,13 @@ AM_CXXFLAGS += -Wno-unused-parameter
 AM_CXXFLAGS += -fno-strict-aliasing
 endif
 
-lib_LTLIBRARIES = libb10-cc.la
-libb10_cc_la_SOURCES = data.cc data.h session.cc session.h
-libb10_cc_la_SOURCES += logger.cc logger.h
-nodist_libb10_cc_la_SOURCES = cc_messages.cc cc_messages.h
-libb10_cc_la_SOURCES += proto_defs.cc
-nodist_libb10_cc_la_SOURCES += proto_defs.h
-libb10_cc_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
+lib_LTLIBRARIES = libkea-cc.la
+libkea_cc_la_SOURCES = data.cc data.h session.cc session.h
+libkea_cc_la_SOURCES += logger.cc logger.h
+nodist_libkea_cc_la_SOURCES = cc_messages.cc cc_messages.h
+libkea_cc_la_SOURCES += proto_defs.cc
+nodist_libkea_cc_la_SOURCES += proto_defs.h
+libkea_cc_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la
 
 CLEANFILES = *.gcno *.gcda session_config.h cc_messages.cc cc_messages.h \
 	proto_defs.h s-messages

+ 3 - 3
src/lib/cc/tests/Makefile.am

@@ -27,10 +27,10 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 # We need to put our libs first, in case gtest (or any dependency, really)
 # is installed in the same location as a different version of bind10
 # Otherwise the linker may not use the source tree libs
-run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libb10-cc.la
-run_unittests_LDADD +=  $(top_builddir)/src/lib/log/libb10-log.la
+run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD +=  $(top_builddir)/src/lib/log/libkea-log.la
 run_unittests_LDADD +=  $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD +=  $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD +=  $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(GTEST_LDADD)
 
 endif

+ 9 - 9
src/lib/config/Makefile.am

@@ -14,18 +14,18 @@ s-messages: config_messages.mes
 
 BUILT_SOURCES = config_messages.h config_messages.cc
 
-lib_LTLIBRARIES = libb10-cfgclient.la
-libb10_cfgclient_la_SOURCES = config_data.h config_data.cc
-libb10_cfgclient_la_SOURCES += module_spec.h module_spec.cc
-libb10_cfgclient_la_SOURCES += ccsession.cc ccsession.h
-libb10_cfgclient_la_SOURCES += config_log.h config_log.cc
+lib_LTLIBRARIES = libkea-cfgclient.la
+libkea_cfgclient_la_SOURCES = config_data.h config_data.cc
+libkea_cfgclient_la_SOURCES += module_spec.h module_spec.cc
+libkea_cfgclient_la_SOURCES += ccsession.cc ccsession.h
+libkea_cfgclient_la_SOURCES += config_log.h config_log.cc
 
-libb10_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libb10-cc.la
-libb10_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
-libb10_cfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
 
-nodist_libb10_cfgclient_la_SOURCES  = config_messages.h config_messages.cc
+nodist_libkea_cfgclient_la_SOURCES  = config_messages.h config_messages.cc
 
 # The message file should be in the distribution.
 EXTRA_DIST = config_messages.mes

+ 4 - 4
src/lib/config/tests/Makefile.am

@@ -26,10 +26,10 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD =  $(GTEST_LDADD)
 run_unittests_LDADD += libfake_session.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-run_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 
 endif

+ 5 - 5
src/lib/cryptolink/Makefile.am

@@ -6,10 +6,10 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 CLEANFILES = *.gcno *.gcda
 
-lib_LTLIBRARIES = libb10-cryptolink.la
+lib_LTLIBRARIES = libkea-cryptolink.la
 
-libb10_cryptolink_la_SOURCES = cryptolink.h cryptolink.cc
-libb10_cryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
+libkea_cryptolink_la_SOURCES = cryptolink.h cryptolink.cc
+libkea_cryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
 
-libb10_cryptolink_la_LDFLAGS = ${BOTAN_LDFLAGS}
-libb10_cryptolink_la_LIBADD = ${BOTAN_LIBS} ${BOTAN_RPATH}
+libkea_cryptolink_la_LDFLAGS = ${BOTAN_LDFLAGS}
+libkea_cryptolink_la_LIBADD = ${BOTAN_LIBS} ${BOTAN_RPATH}

+ 3 - 3
src/lib/cryptolink/tests/Makefile.am

@@ -21,10 +21,10 @@ run_unittests_SOURCES += crypto_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS =  $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS)
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

+ 49 - 49
src/lib/dhcp/Makefile.am

@@ -12,64 +12,64 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
 CLEANFILES = *.gcno *.gcda
 
-lib_LTLIBRARIES = libb10-dhcp++.la
-libb10_dhcp___la_SOURCES  =
-libb10_dhcp___la_SOURCES += classify.h
-libb10_dhcp___la_SOURCES += dhcp6.h dhcp4.h
-libb10_dhcp___la_SOURCES += duid.cc duid.h
-libb10_dhcp___la_SOURCES += hwaddr.cc hwaddr.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_error_handler.h
-libb10_dhcp___la_SOURCES += iface_mgr_linux.cc
-libb10_dhcp___la_SOURCES += iface_mgr_sun.cc
-libb10_dhcp___la_SOURCES += libdhcp++.cc libdhcp++.h
-libb10_dhcp___la_SOURCES += opaque_data_tuple.cc opaque_data_tuple.h
-libb10_dhcp___la_SOURCES += option4_addrlst.cc option4_addrlst.h
-libb10_dhcp___la_SOURCES += option4_client_fqdn.cc option4_client_fqdn.h
-libb10_dhcp___la_SOURCES += option6_ia.cc option6_ia.h
-libb10_dhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
-libb10_dhcp___la_SOURCES += option6_iaprefix.cc option6_iaprefix.h
-libb10_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
-libb10_dhcp___la_SOURCES += option6_client_fqdn.cc option6_client_fqdn.h
-libb10_dhcp___la_SOURCES += option_vendor.cc option_vendor.h
-libb10_dhcp___la_SOURCES += option_vendor_class.cc option_vendor_class.h
-libb10_dhcp___la_SOURCES += option_int.h
-libb10_dhcp___la_SOURCES += option_int_array.h
-libb10_dhcp___la_SOURCES += option.cc option.h
-libb10_dhcp___la_SOURCES += option_custom.cc option_custom.h
-libb10_dhcp___la_SOURCES += option_data_types.cc option_data_types.h
-libb10_dhcp___la_SOURCES += option_definition.cc option_definition.h
-libb10_dhcp___la_SOURCES += option_space.cc option_space.h
-libb10_dhcp___la_SOURCES += option_string.cc option_string.h
-libb10_dhcp___la_SOURCES += protocol_util.cc protocol_util.h
-libb10_dhcp___la_SOURCES += pkt6.cc pkt6.h
-libb10_dhcp___la_SOURCES += pkt4.cc pkt4.h
-libb10_dhcp___la_SOURCES += pkt_filter.h pkt_filter.cc
-libb10_dhcp___la_SOURCES += pkt_filter6.h pkt_filter6.cc
-libb10_dhcp___la_SOURCES += pkt_filter_inet.cc pkt_filter_inet.h
-libb10_dhcp___la_SOURCES += pkt_filter_inet6.cc pkt_filter_inet6.h
+lib_LTLIBRARIES = libkea-dhcp++.la
+libkea_dhcp___la_SOURCES  =
+libkea_dhcp___la_SOURCES += classify.h
+libkea_dhcp___la_SOURCES += dhcp6.h dhcp4.h
+libkea_dhcp___la_SOURCES += duid.cc duid.h
+libkea_dhcp___la_SOURCES += hwaddr.cc hwaddr.h
+libkea_dhcp___la_SOURCES += iface_mgr.cc iface_mgr.h
+libkea_dhcp___la_SOURCES += iface_mgr_bsd.cc
+libkea_dhcp___la_SOURCES += iface_mgr_error_handler.h
+libkea_dhcp___la_SOURCES += iface_mgr_linux.cc
+libkea_dhcp___la_SOURCES += iface_mgr_sun.cc
+libkea_dhcp___la_SOURCES += libdhcp++.cc libdhcp++.h
+libkea_dhcp___la_SOURCES += opaque_data_tuple.cc opaque_data_tuple.h
+libkea_dhcp___la_SOURCES += option4_addrlst.cc option4_addrlst.h
+libkea_dhcp___la_SOURCES += option4_client_fqdn.cc option4_client_fqdn.h
+libkea_dhcp___la_SOURCES += option6_ia.cc option6_ia.h
+libkea_dhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
+libkea_dhcp___la_SOURCES += option6_iaprefix.cc option6_iaprefix.h
+libkea_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
+libkea_dhcp___la_SOURCES += option6_client_fqdn.cc option6_client_fqdn.h
+libkea_dhcp___la_SOURCES += option_vendor.cc option_vendor.h
+libkea_dhcp___la_SOURCES += option_vendor_class.cc option_vendor_class.h
+libkea_dhcp___la_SOURCES += option_int.h
+libkea_dhcp___la_SOURCES += option_int_array.h
+libkea_dhcp___la_SOURCES += option.cc option.h
+libkea_dhcp___la_SOURCES += option_custom.cc option_custom.h
+libkea_dhcp___la_SOURCES += option_data_types.cc option_data_types.h
+libkea_dhcp___la_SOURCES += option_definition.cc option_definition.h
+libkea_dhcp___la_SOURCES += option_space.cc option_space.h
+libkea_dhcp___la_SOURCES += option_string.cc option_string.h
+libkea_dhcp___la_SOURCES += protocol_util.cc protocol_util.h
+libkea_dhcp___la_SOURCES += pkt6.cc pkt6.h
+libkea_dhcp___la_SOURCES += pkt4.cc pkt4.h
+libkea_dhcp___la_SOURCES += pkt_filter.h pkt_filter.cc
+libkea_dhcp___la_SOURCES += pkt_filter6.h pkt_filter6.cc
+libkea_dhcp___la_SOURCES += pkt_filter_inet.cc pkt_filter_inet.h
+libkea_dhcp___la_SOURCES += pkt_filter_inet6.cc pkt_filter_inet6.h
 
 if OS_LINUX
-libb10_dhcp___la_SOURCES += pkt_filter_lpf.cc pkt_filter_lpf.h
+libkea_dhcp___la_SOURCES += pkt_filter_lpf.cc pkt_filter_lpf.h
 endif
 
-libb10_dhcp___la_SOURCES += std_option_defs.h
-libb10_dhcp___la_SOURCES += docsis3_option_defs.h
+libkea_dhcp___la_SOURCES += std_option_defs.h
+libkea_dhcp___la_SOURCES += docsis3_option_defs.h
 
-libb10_dhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
-libb10_dhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_dhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libb10_dhcp___la_LIBADD  += $(top_builddir)/src/lib/dns/libb10-dns++.la
-libb10_dhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libb10-util.la
-libb10_dhcp___la_LDFLAGS  = -no-undefined -version-info 2:0:0
+libkea_dhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_dhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libkea_dhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_dhcp___la_LDFLAGS  = -no-undefined -version-info 2:0:0
 
 EXTRA_DIST  = README libdhcp++.dox
 
 # Specify the headers for copying into the installation directory tree. User-
 # written libraries may need access to all libdhcp++ headers.
-libb10_dhcp___includedir = $(pkgincludedir)/dhcp
-libb10_dhcp___include_HEADERS = \
+libkea_dhcp___includedir = $(pkgincludedir)/dhcp
+libkea_dhcp___include_HEADERS = \
     classify.h \
     dhcp4.h \
     dhcp6.h \
@@ -100,5 +100,5 @@ libb10_dhcp___include_HEADERS = \
 if USE_CLANGPP
 # Disable unused parameter warning caused by some of the
 # Boost headers when compiling with clang.
-libb10_dhcp___la_CXXFLAGS += -Wno-unused-parameter
+libkea_dhcp___la_CXXFLAGS += -Wno-unused-parameter
 endif

+ 7 - 7
src/lib/dhcp/tests/Makefile.am

@@ -40,7 +40,7 @@ libdhcptest_la_SOURCES  += pkt_filter6_test_stub.cc pkt_filter6_test_stub.h
 libdhcptest_la_CXXFLAGS  = $(AM_CXXFLAGS)
 libdhcptest_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libdhcptest_la_LDFLAGS   = $(AM_LDFLAGS)
-libdhcptest_la_LIBADD    = $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+libdhcptest_la_LIBADD    = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 
 TESTS += libdhcp++_unittests
 
@@ -97,12 +97,12 @@ if USE_CLANGPP
 libdhcp___unittests_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter
 endif
 
-libdhcp___unittests_LDADD  = $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+libdhcp___unittests_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libdhcp___unittests_LDADD += $(GTEST_LDADD)
 endif
 

+ 25 - 25
src/lib/dhcp_ddns/Makefile.am

@@ -28,34 +28,34 @@ EXTRA_DIST = dhcp_ddns_messages.mes libdhcp_ddns.dox
 # Get rid of generated message files on a clean
 CLEANFILES = *.gcno *.gcda dhcp_ddns_messages.h dhcp_ddns_messages.cc s-messages
 
-lib_LTLIBRARIES = libb10-dhcp_ddns.la
-libb10_dhcp_ddns_la_SOURCES  =
-libb10_dhcp_ddns_la_SOURCES += dhcp_ddns_log.cc dhcp_ddns_log.h
-libb10_dhcp_ddns_la_SOURCES += ncr_io.cc ncr_io.h
-libb10_dhcp_ddns_la_SOURCES += ncr_msg.cc ncr_msg.h
-libb10_dhcp_ddns_la_SOURCES += ncr_udp.cc ncr_udp.h
-libb10_dhcp_ddns_la_SOURCES += watch_socket.cc watch_socket.h
-
-nodist_libb10_dhcp_ddns_la_SOURCES = dhcp_ddns_messages.cc dhcp_ddns_messages.h
-
-libb10_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS)
-libb10_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_dhcp_ddns_la_LDFLAGS  = $(AM_LDFLAGS)
-libb10_dhcp_ddns_la_LDFLAGS += ${BOTAN_LDFLAGS}
-libb10_dhcp_ddns_la_LIBADD  =
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-libb10_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libb10_dhcp_ddns_la_LIBADD += ${BOTAN_LIBS} ${BOTAN_RPATH}
+lib_LTLIBRARIES = libkea-dhcp_ddns.la
+libkea_dhcp_ddns_la_SOURCES  =
+libkea_dhcp_ddns_la_SOURCES += dhcp_ddns_log.cc dhcp_ddns_log.h
+libkea_dhcp_ddns_la_SOURCES += ncr_io.cc ncr_io.h
+libkea_dhcp_ddns_la_SOURCES += ncr_msg.cc ncr_msg.h
+libkea_dhcp_ddns_la_SOURCES += ncr_udp.cc ncr_udp.h
+libkea_dhcp_ddns_la_SOURCES += watch_socket.cc watch_socket.h
+
+nodist_libkea_dhcp_ddns_la_SOURCES = dhcp_ddns_messages.cc dhcp_ddns_messages.h
+
+libkea_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libkea_dhcp_ddns_la_LDFLAGS  = $(AM_LDFLAGS)
+libkea_dhcp_ddns_la_LDFLAGS += ${BOTAN_LDFLAGS}
+libkea_dhcp_ddns_la_LIBADD  =
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_dhcp_ddns_la_LIBADD += ${BOTAN_LIBS} ${BOTAN_RPATH}
 
 if USE_CLANGPP
 # Disable unused parameter warning caused by some of the
 # Boost headers when compiling with clang.
-libb10_dhcp_ddns_la_CXXFLAGS += -Wno-unused-parameter
+libkea_dhcp_ddns_la_CXXFLAGS += -Wno-unused-parameter
 endif
 

+ 9 - 9
src/lib/dhcp_ddns/tests/Makefile.am

@@ -44,15 +44,15 @@ if USE_CLANGPP
 libdhcp_ddns_unittests_CXXFLAGS += -Wno-unused-parameter
 endif
 
-libdhcp_ddns_unittests_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+libdhcp_ddns_unittests_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libdhcp_ddns_unittests_LDADD += ${BOTAN_LIBS} ${BOTAN_RPATH}
 libdhcp_ddns_unittests_LDADD += $(GTEST_LDADD)
 endif

+ 44 - 44
src/lib/dhcpsrv/Makefile.am

@@ -39,62 +39,62 @@ CLEANFILES = *.gcno *.gcda dhcpsrv_messages.h dhcpsrv_messages.cc s-messages
 # Remove CSV files created by the CSVLeaseFile6 and CSVLeaseFile4 unit tests.
 CLEANFILES += *.csv
 
-lib_LTLIBRARIES = libb10-dhcpsrv.la
-libb10_dhcpsrv_la_SOURCES  =
-libb10_dhcpsrv_la_SOURCES += addr_utilities.cc addr_utilities.h
-libb10_dhcpsrv_la_SOURCES += alloc_engine.cc alloc_engine.h
-libb10_dhcpsrv_la_SOURCES += callout_handle_store.h
-libb10_dhcpsrv_la_SOURCES += csv_lease_file4.cc csv_lease_file4.h
-libb10_dhcpsrv_la_SOURCES += csv_lease_file6.cc csv_lease_file6.h
-libb10_dhcpsrv_la_SOURCES += d2_client_cfg.cc d2_client_cfg.h
-libb10_dhcpsrv_la_SOURCES += d2_client_mgr.cc d2_client_mgr.h
-libb10_dhcpsrv_la_SOURCES += dbaccess_parser.cc dbaccess_parser.h
-libb10_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h
-libb10_dhcpsrv_la_SOURCES += cfgmgr.cc cfgmgr.h
-libb10_dhcpsrv_la_SOURCES += dhcp_config_parser.h
-libb10_dhcpsrv_la_SOURCES += dhcp_parsers.cc dhcp_parsers.h 
-libb10_dhcpsrv_la_SOURCES += key_from_key.h
-libb10_dhcpsrv_la_SOURCES += lease.cc lease.h
-libb10_dhcpsrv_la_SOURCES += lease_mgr.cc lease_mgr.h
-libb10_dhcpsrv_la_SOURCES += lease_mgr_factory.cc lease_mgr_factory.h
-libb10_dhcpsrv_la_SOURCES += memfile_lease_mgr.cc memfile_lease_mgr.h
+lib_LTLIBRARIES = libkea-dhcpsrv.la
+libkea_dhcpsrv_la_SOURCES  =
+libkea_dhcpsrv_la_SOURCES += addr_utilities.cc addr_utilities.h
+libkea_dhcpsrv_la_SOURCES += alloc_engine.cc alloc_engine.h
+libkea_dhcpsrv_la_SOURCES += callout_handle_store.h
+libkea_dhcpsrv_la_SOURCES += csv_lease_file4.cc csv_lease_file4.h
+libkea_dhcpsrv_la_SOURCES += csv_lease_file6.cc csv_lease_file6.h
+libkea_dhcpsrv_la_SOURCES += d2_client_cfg.cc d2_client_cfg.h
+libkea_dhcpsrv_la_SOURCES += d2_client_mgr.cc d2_client_mgr.h
+libkea_dhcpsrv_la_SOURCES += dbaccess_parser.cc dbaccess_parser.h
+libkea_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h
+libkea_dhcpsrv_la_SOURCES += cfgmgr.cc cfgmgr.h
+libkea_dhcpsrv_la_SOURCES += dhcp_config_parser.h
+libkea_dhcpsrv_la_SOURCES += dhcp_parsers.cc dhcp_parsers.h 
+libkea_dhcpsrv_la_SOURCES += key_from_key.h
+libkea_dhcpsrv_la_SOURCES += lease.cc lease.h
+libkea_dhcpsrv_la_SOURCES += lease_mgr.cc lease_mgr.h
+libkea_dhcpsrv_la_SOURCES += lease_mgr_factory.cc lease_mgr_factory.h
+libkea_dhcpsrv_la_SOURCES += memfile_lease_mgr.cc memfile_lease_mgr.h
 if HAVE_MYSQL
-libb10_dhcpsrv_la_SOURCES += mysql_lease_mgr.cc mysql_lease_mgr.h
+libkea_dhcpsrv_la_SOURCES += mysql_lease_mgr.cc mysql_lease_mgr.h
 endif
 if HAVE_PGSQL
-libb10_dhcpsrv_la_SOURCES += pgsql_lease_mgr.cc pgsql_lease_mgr.h
+libkea_dhcpsrv_la_SOURCES += pgsql_lease_mgr.cc pgsql_lease_mgr.h
 endif
-libb10_dhcpsrv_la_SOURCES += option_space_container.h
-libb10_dhcpsrv_la_SOURCES += pool.cc pool.h
-libb10_dhcpsrv_la_SOURCES += subnet.cc subnet.h
-libb10_dhcpsrv_la_SOURCES += triplet.h
-libb10_dhcpsrv_la_SOURCES += utils.h
-
-nodist_libb10_dhcpsrv_la_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
-
-libb10_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
-libb10_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libb10-hooks.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/log/libb10-log.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/util/libb10-util.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cc/libb10-cc.la
-libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libb10-hooks.la
-
-libb10_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 3:0:0
+libkea_dhcpsrv_la_SOURCES += option_space_container.h
+libkea_dhcpsrv_la_SOURCES += pool.cc pool.h
+libkea_dhcpsrv_la_SOURCES += subnet.cc subnet.h
+libkea_dhcpsrv_la_SOURCES += triplet.h
+libkea_dhcpsrv_la_SOURCES += utils.h
+
+nodist_libkea_dhcpsrv_la_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
+
+libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libkea_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+
+libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 3:0:0
 if HAVE_MYSQL
-libb10_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
+libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
 endif
 if HAVE_PGSQL
-libb10_dhcpsrv_la_LDFLAGS += $(PGSQL_LIBS)
+libkea_dhcpsrv_la_LDFLAGS += $(PGSQL_LIBS)
 endif
 
 if USE_CLANGPP
 # Disable unused parameter warning caused by some of the
 # Boost headers when compiling with clang.
-libb10_dhcpsrv_la_CXXFLAGS += -Wno-unused-parameter
+libkea_dhcpsrv_la_CXXFLAGS += -Wno-unused-parameter
 endif
 
 # The message file should be in the distribution

+ 9 - 9
src/lib/dhcpsrv/tests/Makefile.am

@@ -106,16 +106,16 @@ if USE_CLANGPP
 libdhcpsrv_unittests_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter
 endif
 
-libdhcpsrv_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
+libdhcpsrv_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libb10-dhcp_ddns.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libb10-hooks.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libdhcpsrv_unittests_LDADD += $(GTEST_LDADD)
 endif
 

+ 51 - 51
src/lib/dns/Makefile.am

@@ -99,65 +99,65 @@ noinst_SCRIPTS = gen-rdatacode.py
 BUILT_SOURCES = rrclass.h rrtype.h rrparamregistry.cc
 BUILT_SOURCES += rdataclass.h rdataclass.cc
 
-lib_LTLIBRARIES = libb10-dns++.la
+lib_LTLIBRARIES = libkea-dns++.la
 
-libb10_dns___la_LDFLAGS = -no-undefined -version-info 2:0:0
+libkea_dns___la_LDFLAGS = -no-undefined -version-info 2:0:0
 
-libb10_dns___la_SOURCES =
-libb10_dns___la_SOURCES += dns_fwd.h
-libb10_dns___la_SOURCES += edns.h edns.cc
-libb10_dns___la_SOURCES += exceptions.h exceptions.cc
-libb10_dns___la_SOURCES += master_lexer_inputsource.h master_lexer_inputsource.cc
-libb10_dns___la_SOURCES += labelsequence.h labelsequence.cc
-libb10_dns___la_SOURCES += masterload.h masterload.cc
-libb10_dns___la_SOURCES += master_lexer.h master_lexer.cc
-libb10_dns___la_SOURCES += master_lexer_state.h
-libb10_dns___la_SOURCES += master_loader.h master_loader.cc
-libb10_dns___la_SOURCES += message.h message.cc
-libb10_dns___la_SOURCES += messagerenderer.h messagerenderer.cc
-libb10_dns___la_SOURCES += name.h name.cc
-libb10_dns___la_SOURCES += name_internal.h
-libb10_dns___la_SOURCES += nsec3hash.h nsec3hash.cc
-libb10_dns___la_SOURCES += opcode.h opcode.cc
-libb10_dns___la_SOURCES += rcode.h rcode.cc
-libb10_dns___la_SOURCES += rdata.h rdata.cc
-libb10_dns___la_SOURCES += rdatafields.h rdatafields.cc
-libb10_dns___la_SOURCES += rrclass.cc
-libb10_dns___la_SOURCES += rrparamregistry.h
-libb10_dns___la_SOURCES += rrset.h rrset.cc
-libb10_dns___la_SOURCES += rrttl.h rrttl.cc
-libb10_dns___la_SOURCES += rrtype.cc
-libb10_dns___la_SOURCES += rrcollator.h rrcollator.cc
-libb10_dns___la_SOURCES += question.h question.cc
-libb10_dns___la_SOURCES += serial.h serial.cc
-libb10_dns___la_SOURCES += tsig.h tsig.cc
-libb10_dns___la_SOURCES += tsigerror.h tsigerror.cc
-libb10_dns___la_SOURCES += tsigkey.h tsigkey.cc
-libb10_dns___la_SOURCES += tsigrecord.h tsigrecord.cc
-libb10_dns___la_SOURCES += master_loader_callbacks.h master_loader_callbacks.cc
-libb10_dns___la_SOURCES += master_loader.h
-libb10_dns___la_SOURCES += rrset_collection_base.h
-libb10_dns___la_SOURCES += rrset_collection.h rrset_collection.cc
-libb10_dns___la_SOURCES += zone_checker.h zone_checker.cc
-libb10_dns___la_SOURCES += rdata_pimpl_holder.h
-libb10_dns___la_SOURCES += rdata/generic/detail/char_string.h
-libb10_dns___la_SOURCES += rdata/generic/detail/char_string.cc
-libb10_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h
-libb10_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc
-libb10_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.cc
-libb10_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.h
-libb10_dns___la_SOURCES += rdata/generic/detail/txt_like.h
-libb10_dns___la_SOURCES += rdata/generic/detail/ds_like.h
+libkea_dns___la_SOURCES =
+libkea_dns___la_SOURCES += dns_fwd.h
+libkea_dns___la_SOURCES += edns.h edns.cc
+libkea_dns___la_SOURCES += exceptions.h exceptions.cc
+libkea_dns___la_SOURCES += master_lexer_inputsource.h master_lexer_inputsource.cc
+libkea_dns___la_SOURCES += labelsequence.h labelsequence.cc
+libkea_dns___la_SOURCES += masterload.h masterload.cc
+libkea_dns___la_SOURCES += master_lexer.h master_lexer.cc
+libkea_dns___la_SOURCES += master_lexer_state.h
+libkea_dns___la_SOURCES += master_loader.h master_loader.cc
+libkea_dns___la_SOURCES += message.h message.cc
+libkea_dns___la_SOURCES += messagerenderer.h messagerenderer.cc
+libkea_dns___la_SOURCES += name.h name.cc
+libkea_dns___la_SOURCES += name_internal.h
+libkea_dns___la_SOURCES += nsec3hash.h nsec3hash.cc
+libkea_dns___la_SOURCES += opcode.h opcode.cc
+libkea_dns___la_SOURCES += rcode.h rcode.cc
+libkea_dns___la_SOURCES += rdata.h rdata.cc
+libkea_dns___la_SOURCES += rdatafields.h rdatafields.cc
+libkea_dns___la_SOURCES += rrclass.cc
+libkea_dns___la_SOURCES += rrparamregistry.h
+libkea_dns___la_SOURCES += rrset.h rrset.cc
+libkea_dns___la_SOURCES += rrttl.h rrttl.cc
+libkea_dns___la_SOURCES += rrtype.cc
+libkea_dns___la_SOURCES += rrcollator.h rrcollator.cc
+libkea_dns___la_SOURCES += question.h question.cc
+libkea_dns___la_SOURCES += serial.h serial.cc
+libkea_dns___la_SOURCES += tsig.h tsig.cc
+libkea_dns___la_SOURCES += tsigerror.h tsigerror.cc
+libkea_dns___la_SOURCES += tsigkey.h tsigkey.cc
+libkea_dns___la_SOURCES += tsigrecord.h tsigrecord.cc
+libkea_dns___la_SOURCES += master_loader_callbacks.h master_loader_callbacks.cc
+libkea_dns___la_SOURCES += master_loader.h
+libkea_dns___la_SOURCES += rrset_collection_base.h
+libkea_dns___la_SOURCES += rrset_collection.h rrset_collection.cc
+libkea_dns___la_SOURCES += zone_checker.h zone_checker.cc
+libkea_dns___la_SOURCES += rdata_pimpl_holder.h
+libkea_dns___la_SOURCES += rdata/generic/detail/char_string.h
+libkea_dns___la_SOURCES += rdata/generic/detail/char_string.cc
+libkea_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h
+libkea_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc
+libkea_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.cc
+libkea_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.h
+libkea_dns___la_SOURCES += rdata/generic/detail/txt_like.h
+libkea_dns___la_SOURCES += rdata/generic/detail/ds_like.h
 
-libb10_dns___la_CPPFLAGS = $(AM_CPPFLAGS)
+libkea_dns___la_CPPFLAGS = $(AM_CPPFLAGS)
 # Most applications of libdns++ will only implicitly rely on libcryptolink,
 # so we add the dependency here so that the applications don't have to link
 # libcryptolink explicitly.
-libb10_dns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la
-libb10_dns___la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
+libkea_dns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_dns___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 
 nodist_libdns___include_HEADERS = rdataclass.h rrclass.h rrtype.h
-nodist_libb10_dns___la_SOURCES = rdataclass.cc rrparamregistry.cc
+nodist_libkea_dns___la_SOURCES = rdataclass.cc rrparamregistry.cc
 
 rrclass.h: rrclass-placeholder.h
 rrtype.h: rrtype-placeholder.h

+ 6 - 6
src/lib/dns/benchmarks/Makefile.am

@@ -13,12 +13,12 @@ noinst_PROGRAMS = rdatarender_bench message_renderer_bench
 
 rdatarender_bench_SOURCES = rdatarender_bench.cc
 
-rdatarender_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
-rdatarender_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+rdatarender_bench_LDADD = $(top_builddir)/src/lib/dns/libkea-dns++.la
+rdatarender_bench_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 message_renderer_bench_SOURCES = message_renderer_bench.cc
 message_renderer_bench_SOURCES += oldmessagerenderer.h oldmessagerenderer.cc
-message_renderer_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
-message_renderer_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+message_renderer_bench_LDADD = $(top_builddir)/src/lib/dns/libkea-dns++.la
+message_renderer_bench_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

+ 32 - 32
src/lib/dns/python/Makefile.am

@@ -4,35 +4,35 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
-lib_LTLIBRARIES = libb10-pydnspp.la
-libb10_pydnspp_la_SOURCES = pydnspp_common.cc pydnspp_common.h
-libb10_pydnspp_la_SOURCES += pydnspp_config.h pydnspp_towire.h
-libb10_pydnspp_la_SOURCES += name_python.cc name_python.h
-libb10_pydnspp_la_SOURCES += nsec3hash_python.cc nsec3hash_python.h
-libb10_pydnspp_la_SOURCES += rrset_python.cc rrset_python.h
-libb10_pydnspp_la_SOURCES += rrclass_python.cc rrclass_python.h
-libb10_pydnspp_la_SOURCES += rrtype_python.cc rrtype_python.h
-libb10_pydnspp_la_SOURCES += rrttl_python.cc rrttl_python.h
-libb10_pydnspp_la_SOURCES += rdata_python.cc rdata_python.h
-libb10_pydnspp_la_SOURCES += serial_python.cc serial_python.h
-libb10_pydnspp_la_SOURCES += messagerenderer_python.cc messagerenderer_python.h
-libb10_pydnspp_la_SOURCES += rcode_python.cc rcode_python.h
-libb10_pydnspp_la_SOURCES += opcode_python.cc opcode_python.h
-libb10_pydnspp_la_SOURCES += question_python.cc question_python.h
-libb10_pydnspp_la_SOURCES += tsigkey_python.cc tsigkey_python.h
-libb10_pydnspp_la_SOURCES += tsigerror_python.cc tsigerror_python.h
-libb10_pydnspp_la_SOURCES += tsig_rdata_python.cc tsig_rdata_python.h
-libb10_pydnspp_la_SOURCES += tsigrecord_python.cc tsigrecord_python.h
-libb10_pydnspp_la_SOURCES += tsig_python.cc tsig_python.h
-libb10_pydnspp_la_SOURCES += edns_python.cc edns_python.h
-libb10_pydnspp_la_SOURCES += message_python.cc message_python.h
-libb10_pydnspp_la_SOURCES += rrset_collection_python.cc
-libb10_pydnspp_la_SOURCES += rrset_collection_python.h
-libb10_pydnspp_la_SOURCES += zone_checker_python.cc zone_checker_python.h
-
-libb10_pydnspp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
-libb10_pydnspp_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
-libb10_pydnspp_la_LDFLAGS = $(PYTHON_LDFLAGS)
+lib_LTLIBRARIES = libkea-pydnspp.la
+libkea_pydnspp_la_SOURCES = pydnspp_common.cc pydnspp_common.h
+libkea_pydnspp_la_SOURCES += pydnspp_config.h pydnspp_towire.h
+libkea_pydnspp_la_SOURCES += name_python.cc name_python.h
+libkea_pydnspp_la_SOURCES += nsec3hash_python.cc nsec3hash_python.h
+libkea_pydnspp_la_SOURCES += rrset_python.cc rrset_python.h
+libkea_pydnspp_la_SOURCES += rrclass_python.cc rrclass_python.h
+libkea_pydnspp_la_SOURCES += rrtype_python.cc rrtype_python.h
+libkea_pydnspp_la_SOURCES += rrttl_python.cc rrttl_python.h
+libkea_pydnspp_la_SOURCES += rdata_python.cc rdata_python.h
+libkea_pydnspp_la_SOURCES += serial_python.cc serial_python.h
+libkea_pydnspp_la_SOURCES += messagerenderer_python.cc messagerenderer_python.h
+libkea_pydnspp_la_SOURCES += rcode_python.cc rcode_python.h
+libkea_pydnspp_la_SOURCES += opcode_python.cc opcode_python.h
+libkea_pydnspp_la_SOURCES += question_python.cc question_python.h
+libkea_pydnspp_la_SOURCES += tsigkey_python.cc tsigkey_python.h
+libkea_pydnspp_la_SOURCES += tsigerror_python.cc tsigerror_python.h
+libkea_pydnspp_la_SOURCES += tsig_rdata_python.cc tsig_rdata_python.h
+libkea_pydnspp_la_SOURCES += tsigrecord_python.cc tsigrecord_python.h
+libkea_pydnspp_la_SOURCES += tsig_python.cc tsig_python.h
+libkea_pydnspp_la_SOURCES += edns_python.cc edns_python.h
+libkea_pydnspp_la_SOURCES += message_python.cc message_python.h
+libkea_pydnspp_la_SOURCES += rrset_collection_python.cc
+libkea_pydnspp_la_SOURCES += rrset_collection_python.h
+libkea_pydnspp_la_SOURCES += zone_checker_python.cc zone_checker_python.h
+
+libkea_pydnspp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
+libkea_pydnspp_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
+libkea_pydnspp_la_LDFLAGS = $(PYTHON_LDFLAGS)
 
 
 
@@ -53,7 +53,7 @@ EXTRA_DIST += zone_checker_python_inc.cc
 # Python prefers .so, while some OSes (specifically MacOS) use a different
 # suffix for dynamic objects.  -module is necessary to work this around.
 pydnspp_la_LDFLAGS += -module -avoid-version
-pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
-pydnspp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-pydnspp_la_LIBADD += libb10-pydnspp.la
+pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libkea-dns++.la
+pydnspp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+pydnspp_la_LIBADD += libkea-pydnspp.la
 pydnspp_la_LIBADD += $(PYTHON_LIB)

+ 3 - 3
src/lib/dns/tests/Makefile.am

@@ -88,10 +88,10 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 # an older version of botan, and somehow that version gets
 # linked if we don't
 run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
-run_unittests_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+run_unittests_LDADD = $(top_builddir)/src/lib/dns/libkea-dns++.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(BOTAN_LIBS) $(GTEST_LDADD)
 endif
 

+ 4 - 4
src/lib/exceptions/Makefile.am

@@ -3,10 +3,10 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CXXFLAGS=$(B10_CXXFLAGS)
 
-lib_LTLIBRARIES = libb10-exceptions.la
-libb10_exceptions_la_SOURCES = exceptions.h exceptions.cc
+lib_LTLIBRARIES = libkea-exceptions.la
+libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc
 
 CLEANFILES = *.gcno *.gcda
 
-libb10_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
-libb10_exceptions_include_HEADERS = exceptions.h
+libkea_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
+libkea_exceptions_include_HEADERS = exceptions.h

+ 1 - 1
src/lib/exceptions/tests/Makefile.am

@@ -20,7 +20,7 @@ run_unittests_SOURCES += exceptions_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

+ 23 - 23
src/lib/hooks/Makefile.am

@@ -28,34 +28,34 @@ EXTRA_DIST = hooks_messages.mes
 # Get rid of generated message files on a clean
 CLEANFILES = *.gcno *.gcda hooks_messages.h hooks_messages.cc s-messages
 
-lib_LTLIBRARIES = libb10-hooks.la
-libb10_hooks_la_SOURCES  =
-libb10_hooks_la_SOURCES += callout_handle.cc callout_handle.h
-libb10_hooks_la_SOURCES += callout_manager.cc callout_manager.h
-libb10_hooks_la_SOURCES += hooks.h hooks.cc
-libb10_hooks_la_SOURCES += hooks_log.cc hooks_log.h
-libb10_hooks_la_SOURCES += hooks_manager.cc hooks_manager.h
-libb10_hooks_la_SOURCES += library_handle.cc library_handle.h
-libb10_hooks_la_SOURCES += library_manager.cc library_manager.h
-libb10_hooks_la_SOURCES += library_manager_collection.cc library_manager_collection.h
-libb10_hooks_la_SOURCES += pointer_converter.h
-libb10_hooks_la_SOURCES += server_hooks.cc server_hooks.h
+lib_LTLIBRARIES = libkea-hooks.la
+libkea_hooks_la_SOURCES  =
+libkea_hooks_la_SOURCES += callout_handle.cc callout_handle.h
+libkea_hooks_la_SOURCES += callout_manager.cc callout_manager.h
+libkea_hooks_la_SOURCES += hooks.h hooks.cc
+libkea_hooks_la_SOURCES += hooks_log.cc hooks_log.h
+libkea_hooks_la_SOURCES += hooks_manager.cc hooks_manager.h
+libkea_hooks_la_SOURCES += library_handle.cc library_handle.h
+libkea_hooks_la_SOURCES += library_manager.cc library_manager.h
+libkea_hooks_la_SOURCES += library_manager_collection.cc library_manager_collection.h
+libkea_hooks_la_SOURCES += pointer_converter.h
+libkea_hooks_la_SOURCES += server_hooks.cc server_hooks.h
 
-nodist_libb10_hooks_la_SOURCES = hooks_messages.cc hooks_messages.h
+nodist_libkea_hooks_la_SOURCES = hooks_messages.cc hooks_messages.h
 
-libb10_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
-libb10_hooks_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_hooks_la_LDFLAGS  = $(AM_LDFLAGS)
-libb10_hooks_la_LIBADD  =
-libb10_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
-libb10_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
-libb10_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS)
+libkea_hooks_la_LIBADD  =
+libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 # Specify the headers for copying into the installation directory tree. User-
 # written libraries only need the definitions from the headers for the
 # CalloutHandle and LibraryHandle objects.
-libb10_hooks_includedir = $(pkgincludedir)/hooks
-libb10_hooks_include_HEADERS = \
+libkea_hooks_includedir = $(pkgincludedir)/hooks
+libkea_hooks_include_HEADERS = \
     callout_handle.h \
     library_handle.h \
     hooks.h
@@ -63,5 +63,5 @@ libb10_hooks_include_HEADERS = \
 if USE_CLANGPP
 # Disable unused parameter warning caused by some of the
 # Boost headers when compiling with clang.
-libb10_hooks_la_CXXFLAGS += -Wno-unused-parameter
+libkea_hooks_la_CXXFLAGS += -Wno-unused-parameter
 endif

+ 1 - 1
src/lib/hooks/hooks_user.dox

@@ -604,7 +604,7 @@ installed BIND 10.
 - The list of libraries that need to be included in the command line
 depends on the functionality used by the hook code and the module to
 which they are attached (e.g. hook code for DNS will need to link against
-the libb10-dns++ library).  Depending on operating system, you may also need
+the libkea-dns++ library).  Depending on operating system, you may also need
 to explicitly list libraries on which the BIND 10 libraries depend.
 
 @subsection hooksdgConfiguration Configuring the Hook Library

+ 5 - 5
src/lib/hooks/tests/Makefile.am

@@ -10,11 +10,11 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) $(MULTITHREADING_FLAG)
 AM_CXXFLAGS  = $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
 # BIND 10 libraries against which the test user libraries are linked.
-HOOKS_LIB      = $(top_builddir)/src/lib/hooks/libb10-hooks.la
-LOG_LIB        = $(top_builddir)/src/lib/log/libb10-log.la
-EXCEPTIONS_LIB = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-UTIL_LIB       = $(top_builddir)/src/lib/util/libb10-util.la
-THREADS_LIB    = $(top_builddir)/src/lib/util/threads/libb10-threads.la
+HOOKS_LIB      = $(top_builddir)/src/lib/hooks/libkea-hooks.la
+LOG_LIB        = $(top_builddir)/src/lib/log/libkea-log.la
+EXCEPTIONS_LIB = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+UTIL_LIB       = $(top_builddir)/src/lib/util/libkea-util.la
+THREADS_LIB    = $(top_builddir)/src/lib/util/threads/libkea-threads.la
 
 ALL_LIBS       = $(HOOKS_LIB) $(LOG_LIB) $(EXCEPTIONS_LIB) $(UTIL_LIB) $(THREADS_LIB)
 

+ 34 - 34
src/lib/log/Makefile.am

@@ -6,31 +6,31 @@ AM_CPPFLAGS += -DTOP_BUILDDIR=\"${abs_top_builddir}\"
 
 CLEANFILES = *.gcno *.gcda
 
-lib_LTLIBRARIES = libb10-log.la
-libb10_log_la_SOURCES  =
-libb10_log_la_SOURCES += logimpl_messages.cc logimpl_messages.h
-libb10_log_la_SOURCES += log_dbglevels.h
-libb10_log_la_SOURCES += log_formatter.h log_formatter.cc
-libb10_log_la_SOURCES += logger.cc logger.h
-libb10_log_la_SOURCES += logger_impl.cc logger_impl.h
-libb10_log_la_SOURCES += logger_level.h
-libb10_log_la_SOURCES += logger_level.cc logger_level.h
-libb10_log_la_SOURCES += logger_level_impl.cc logger_level_impl.h
-libb10_log_la_SOURCES += logger_manager.cc logger_manager.h
-libb10_log_la_SOURCES += logger_manager_impl.cc logger_manager_impl.h
-libb10_log_la_SOURCES += logger_name.cc logger_name.h
-libb10_log_la_SOURCES += logger_specification.h
-libb10_log_la_SOURCES += logger_support.cc logger_support.h
-libb10_log_la_SOURCES += logger_unittest_support.cc logger_unittest_support.h
-libb10_log_la_SOURCES += log_messages.cc log_messages.h
-libb10_log_la_SOURCES += macros.h
-libb10_log_la_SOURCES += message_dictionary.cc message_dictionary.h
-libb10_log_la_SOURCES += message_exception.h
-libb10_log_la_SOURCES += message_initializer.cc message_initializer.h
-libb10_log_la_SOURCES += message_reader.cc message_reader.h
-libb10_log_la_SOURCES += message_types.h
-libb10_log_la_SOURCES += output_option.cc output_option.h
-libb10_log_la_SOURCES += buffer_appender_impl.cc buffer_appender_impl.h
+lib_LTLIBRARIES = libkea-log.la
+libkea_log_la_SOURCES  =
+libkea_log_la_SOURCES += logimpl_messages.cc logimpl_messages.h
+libkea_log_la_SOURCES += log_dbglevels.h
+libkea_log_la_SOURCES += log_formatter.h log_formatter.cc
+libkea_log_la_SOURCES += logger.cc logger.h
+libkea_log_la_SOURCES += logger_impl.cc logger_impl.h
+libkea_log_la_SOURCES += logger_level.h
+libkea_log_la_SOURCES += logger_level.cc logger_level.h
+libkea_log_la_SOURCES += logger_level_impl.cc logger_level_impl.h
+libkea_log_la_SOURCES += logger_manager.cc logger_manager.h
+libkea_log_la_SOURCES += logger_manager_impl.cc logger_manager_impl.h
+libkea_log_la_SOURCES += logger_name.cc logger_name.h
+libkea_log_la_SOURCES += logger_specification.h
+libkea_log_la_SOURCES += logger_support.cc logger_support.h
+libkea_log_la_SOURCES += logger_unittest_support.cc logger_unittest_support.h
+libkea_log_la_SOURCES += log_messages.cc log_messages.h
+libkea_log_la_SOURCES += macros.h
+libkea_log_la_SOURCES += message_dictionary.cc message_dictionary.h
+libkea_log_la_SOURCES += message_exception.h
+libkea_log_la_SOURCES += message_initializer.cc message_initializer.h
+libkea_log_la_SOURCES += message_reader.cc message_reader.h
+libkea_log_la_SOURCES += message_types.h
+libkea_log_la_SOURCES += output_option.cc output_option.h
+libkea_log_la_SOURCES += buffer_appender_impl.cc buffer_appender_impl.h
 
 EXTRA_DIST  = logging.dox
 EXTRA_DIST += logimpl_messages.mes
@@ -38,20 +38,20 @@ EXTRA_DIST += log_messages.mes
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)
-libb10_log_la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_log_la_CXXFLAGS = $(AM_CXXFLAGS)
 if USE_GXX
-libb10_log_la_CXXFLAGS += -Wno-unused-parameter
+libkea_log_la_CXXFLAGS += -Wno-unused-parameter
 endif
-libb10_log_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_log_la_LIBADD   = $(top_builddir)/src/lib/util/libb10-util.la
-libb10_log_la_LIBADD  += interprocess/libb10-log_interprocess.la
-libb10_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
-libb10_log_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libkea_log_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libkea_log_la_LIBADD   = $(top_builddir)/src/lib/util/libkea-util.la
+libkea_log_la_LIBADD  += interprocess/libkea-log_interprocess.la
+libkea_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
+libkea_log_la_LDFLAGS = -no-undefined -version-info 1:0:0
 
 # Specify the headers for copying into the installation directory tree. User-
 # written libraries only need the definitions for logger.h and dependencies.
-libb10_log_includedir = $(pkgincludedir)/log
-libb10_log_include_HEADERS = \
+libkea_log_includedir = $(pkgincludedir)/log
+libkea_log_include_HEADERS = \
     log_formatter.h \
     logger.h \
     logger_level.h \

+ 3 - 3
src/lib/log/compiler/Makefile.am

@@ -14,6 +14,6 @@ CLEANFILES = *.gcno *.gcda
 noinst_PROGRAMS = message
 
 message_SOURCES = message.cc
-message_LDADD   = $(top_builddir)/src/lib/log/libb10-log.la
-message_LDADD  += $(top_builddir)/src/lib/util/libb10-util.la
-message_LDADD  += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+message_LDADD   = $(top_builddir)/src/lib/log/libkea-log.la
+message_LDADD  += $(top_builddir)/src/lib/util/libkea-util.la
+message_LDADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

+ 7 - 7
src/lib/log/interprocess/Makefile.am

@@ -8,14 +8,14 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 CLEANFILES = *.gcno *.gcda
 
-noinst_LTLIBRARIES = libb10-log_interprocess.la
+noinst_LTLIBRARIES = libkea-log_interprocess.la
 
-libb10_log_interprocess_la_SOURCES = interprocess_sync.h
-libb10_log_interprocess_la_SOURCES += interprocess_sync_file.h
-libb10_log_interprocess_la_SOURCES += interprocess_sync_file.cc
-libb10_log_interprocess_la_SOURCES += interprocess_sync_null.h
-libb10_log_interprocess_la_SOURCES += interprocess_sync_null.cc
+libkea_log_interprocess_la_SOURCES = interprocess_sync.h
+libkea_log_interprocess_la_SOURCES += interprocess_sync_file.h
+libkea_log_interprocess_la_SOURCES += interprocess_sync_file.cc
+libkea_log_interprocess_la_SOURCES += interprocess_sync_null.h
+libkea_log_interprocess_la_SOURCES += interprocess_sync_null.cc
 
-libb10_log_interprocess_la_LIBADD  = $(top_builddir)/src/lib/util/threads/libb10-threads.la
+libkea_log_interprocess_la_LIBADD  = $(top_builddir)/src/lib/util/threads/libkea-threads.la
 
 EXTRA_DIST  = README

+ 3 - 3
src/lib/log/interprocess/tests/Makefile.am

@@ -27,10 +27,10 @@ run_unittests_SOURCES += interprocess_sync_null_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD = ../libb10-log_interprocess.la
+run_unittests_LDADD = ../libkea-log_interprocess.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(GTEST_LDADD)
 endif
 

+ 18 - 18
src/lib/log/tests/Makefile.am

@@ -26,40 +26,40 @@ noinst_PROGRAMS = logger_example
 logger_example_SOURCES = logger_example.cc
 logger_example_CPPFLAGS = $(AM_CPPFLAGS)
 logger_example_LDFLAGS = $(AM_LDFLAGS)
-logger_example_LDADD  = $(top_builddir)/src/lib/log/libb10-log.la
-logger_example_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+logger_example_LDADD  = $(top_builddir)/src/lib/log/libkea-log.la
+logger_example_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
 
 noinst_PROGRAMS += init_logger_test
 init_logger_test_SOURCES = init_logger_test.cc
 init_logger_test_CPPFLAGS = $(AM_CPPFLAGS)
 init_logger_test_LDFLAGS = $(AM_LDFLAGS)
-init_logger_test_LDADD  = $(top_builddir)/src/lib/log/libb10-log.la
-init_logger_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+init_logger_test_LDADD  = $(top_builddir)/src/lib/log/libkea-log.la
+init_logger_test_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
 
 noinst_PROGRAMS += buffer_logger_test
 buffer_logger_test_SOURCES = buffer_logger_test.cc
 buffer_logger_test_CPPFLAGS = $(AM_CPPFLAGS)
 buffer_logger_test_LDFLAGS = $(AM_LDFLAGS)
-buffer_logger_test_LDADD  = $(top_builddir)/src/lib/log/libb10-log.la
-buffer_logger_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-buffer_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+buffer_logger_test_LDADD  = $(top_builddir)/src/lib/log/libkea-log.la
+buffer_logger_test_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+buffer_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 buffer_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
 
-# This test directly uses libb10-threads, and on some systems it seems to
-# require explicit LDADD (even if libb10-log has indirect dependencies)
+# This test directly uses libkea-threads, and on some systems it seems to
+# require explicit LDADD (even if libkea-log has indirect dependencies)
 noinst_PROGRAMS += logger_lock_test
 logger_lock_test_SOURCES = logger_lock_test.cc
 nodist_logger_lock_test_SOURCES = log_test_messages.cc log_test_messages.h
 logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS)
 logger_lock_test_LDFLAGS = $(AM_LDFLAGS)
-logger_lock_test_LDADD  = $(top_builddir)/src/lib/log/libb10-log.la
-logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-logger_lock_test_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
-logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+logger_lock_test_LDADD  = $(top_builddir)/src/lib/log/libkea-log.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
 
 TESTS_ENVIRONMENT = \
@@ -76,10 +76,10 @@ endif
 AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
 AM_LDFLAGS  += $(GTEST_LDFLAGS)
 
-AM_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-AM_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+AM_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+AM_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-AM_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+AM_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 AM_LDADD += $(GTEST_LDADD)
 

+ 4 - 4
src/lib/python/isc/log/Makefile.am

@@ -14,10 +14,10 @@ log_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
 log_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
 log_la_LDFLAGS = $(PYTHON_LDFLAGS)
 log_la_LDFLAGS += -module -avoid-version
-log_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
-log_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-log_la_LIBADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+log_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la
+log_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+log_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 log_la_LIBADD += $(PYTHON_LIB)
 
 # This is not installed, it helps locate the module during tests

+ 1 - 1
src/lib/python/isc/util/cio/Makefile.am

@@ -24,7 +24,7 @@ socketsession_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
 # Python prefers .so, while some OSes (specifically MacOS) use a different
 # suffix for dynamic objects.  -module is necessary to work this around.
 socketsession_la_LDFLAGS += -module -avoid-version
-socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
+socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libkea-util-io.la
 socketsession_la_LIBADD += $(PYTHON_LIB)
 
 # This is not installed, it helps locate the module during tests

+ 7 - 7
src/lib/testutils/Makefile.am

@@ -5,14 +5,14 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS=$(B10_CXXFLAGS)
 
 if HAVE_GTEST
-noinst_LTLIBRARIES = libb10-testutils.la
+noinst_LTLIBRARIES = libkea-testutils.la
 
-libb10_testutils_la_SOURCES = srv_test.h srv_test.cc
-libb10_testutils_la_SOURCES += dnsmessage_test.h dnsmessage_test.cc
-libb10_testutils_la_SOURCES += mockups.h
-libb10_testutils_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-libb10_testutils_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libb10_testutils_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+libkea_testutils_la_SOURCES = srv_test.h srv_test.cc
+libkea_testutils_la_SOURCES += dnsmessage_test.h dnsmessage_test.cc
+libkea_testutils_la_SOURCES += mockups.h
+libkea_testutils_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+libkea_testutils_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_testutils_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 endif
 
 EXTRA_DIST = portconfig.h socket_request.h

+ 23 - 23
src/lib/util/Makefile.am

@@ -18,32 +18,32 @@ if USE_SHARED_MEMORY
 AM_CXXFLAGS += $(BOOST_MAPPED_FILE_CXXFLAG)
 endif
 
-lib_LTLIBRARIES = libb10-util.la
-libb10_util_la_SOURCES  = csv_file.h csv_file.cc
-libb10_util_la_SOURCES += filename.h filename.cc
-libb10_util_la_SOURCES += locks.h lru_list.h
-libb10_util_la_SOURCES += strutil.h strutil.cc
-libb10_util_la_SOURCES += buffer.h io_utilities.h
-libb10_util_la_SOURCES += time_utilities.h time_utilities.cc
-libb10_util_la_SOURCES += memory_segment.h
-libb10_util_la_SOURCES += memory_segment_local.h memory_segment_local.cc
+lib_LTLIBRARIES = libkea-util.la
+libkea_util_la_SOURCES  = csv_file.h csv_file.cc
+libkea_util_la_SOURCES += filename.h filename.cc
+libkea_util_la_SOURCES += locks.h lru_list.h
+libkea_util_la_SOURCES += strutil.h strutil.cc
+libkea_util_la_SOURCES += buffer.h io_utilities.h
+libkea_util_la_SOURCES += time_utilities.h time_utilities.cc
+libkea_util_la_SOURCES += memory_segment.h
+libkea_util_la_SOURCES += memory_segment_local.h memory_segment_local.cc
 if USE_SHARED_MEMORY
-libb10_util_la_SOURCES += memory_segment_mapped.h memory_segment_mapped.cc
+libkea_util_la_SOURCES += memory_segment_mapped.h memory_segment_mapped.cc
 endif
-libb10_util_la_SOURCES += range_utilities.h
-libb10_util_la_SOURCES += hash/sha1.h hash/sha1.cc
-libb10_util_la_SOURCES += encode/base16_from_binary.h
-libb10_util_la_SOURCES += encode/base32hex.h encode/base64.h
-libb10_util_la_SOURCES += encode/base32hex_from_binary.h
-libb10_util_la_SOURCES += encode/base_n.cc encode/hex.h
-libb10_util_la_SOURCES += encode/binary_from_base32hex.h
-libb10_util_la_SOURCES += encode/binary_from_base16.h
-libb10_util_la_SOURCES += random/qid_gen.h random/qid_gen.cc
-libb10_util_la_SOURCES += random/random_number_generator.h
+libkea_util_la_SOURCES += range_utilities.h
+libkea_util_la_SOURCES += hash/sha1.h hash/sha1.cc
+libkea_util_la_SOURCES += encode/base16_from_binary.h
+libkea_util_la_SOURCES += encode/base32hex.h encode/base64.h
+libkea_util_la_SOURCES += encode/base32hex_from_binary.h
+libkea_util_la_SOURCES += encode/base_n.cc encode/hex.h
+libkea_util_la_SOURCES += encode/binary_from_base32hex.h
+libkea_util_la_SOURCES += encode/binary_from_base16.h
+libkea_util_la_SOURCES += random/qid_gen.h random/qid_gen.cc
+libkea_util_la_SOURCES += random/random_number_generator.h
 
 EXTRA_DIST = python/pycppwrapper_util.h
-libb10_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libkea_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 CLEANFILES = *.gcno *.gcda
 
-libb10_util_includedir = $(includedir)/$(PACKAGE_NAME)/util
-libb10_util_include_HEADERS = buffer.h io_utilities.h
+libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util
+libkea_util_include_HEADERS = buffer.h io_utilities.h

+ 6 - 6
src/lib/util/io/Makefile.am

@@ -3,11 +3,11 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 
-lib_LTLIBRARIES = libb10-util-io.la
-libb10_util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
-libb10_util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
-libb10_util_io_la_SOURCES += pktinfo_utilities.h
-libb10_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+lib_LTLIBRARIES = libkea-util-io.la
+libkea_util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
+libkea_util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
+libkea_util_io_la_SOURCES += pktinfo_utilities.h
+libkea_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 CLEANFILES = *.gcno *.gcda
 
@@ -16,7 +16,7 @@ pyexec_LTLIBRARIES = libutil_io_python.la
 # suffix for dynamic objects.  -module is necessary to work this around.
 libutil_io_python_la_LDFLAGS = -module -avoid-version
 libutil_io_python_la_SOURCES = fdshare_python.cc
-libutil_io_python_la_LIBADD = libb10-util-io.la
+libutil_io_python_la_LIBADD = libkea-util-io.la
 libutil_io_python_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
 # Note: PYTHON_CXXFLAGS may have some -Wno... workaround, which must be
 # placed after -Wextra defined in AM_CXXFLAGS

+ 1 - 1
src/lib/util/pyunittests/Makefile.am

@@ -14,7 +14,7 @@ pyunittests_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
 # Python prefers .so, while some OSes (specifically MacOS) use a different
 # suffix for dynamic objects.  -module is necessary to work this around.
 pyunittests_util_la_LDFLAGS += -module -avoid-version
-pyunittests_util_la_LIBADD = $(top_builddir)/src/lib/util/libb10-util.la
+pyunittests_util_la_LIBADD = $(top_builddir)/src/lib/util/libkea-util.la
 pyunittests_util_la_LIBADD += $(PYTHON_LIB)
 
 # hack to trigger libtool to not create a convenience archive,

+ 3 - 3
src/lib/util/tests/Makefile.am

@@ -51,10 +51,10 @@ run_unittests_SOURCES += range_utilities_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD = $(top_builddir)/src/lib/util/libb10-util.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
+run_unittests_LDADD = $(top_builddir)/src/lib/util/libkea-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(GTEST_LDADD)
 endif
 

+ 5 - 5
src/lib/util/threads/Makefile.am

@@ -4,10 +4,10 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(MULTITHREADING_FLAG)
 
-lib_LTLIBRARIES = libb10-threads.la
-libb10_threads_la_SOURCES  = sync.h sync.cc
-libb10_threads_la_SOURCES += thread.h thread.cc
-libb10_threads_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libb10_threads_la_LIBADD += $(PTHREAD_LDFLAGS)
+lib_LTLIBRARIES = libkea-threads.la
+libkea_threads_la_SOURCES  = sync.h sync.cc
+libkea_threads_la_SOURCES += thread.h thread.cc
+libkea_threads_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_threads_la_LIBADD += $(PTHREAD_LDFLAGS)
 
 CLEANFILES = *.gcno *.gcda

+ 1 - 1
src/lib/util/threads/tests/Makefile.am

@@ -28,7 +28,7 @@ run_unittests_SOURCES += condvar_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PTHREAD_LDFLAGS)
 
-run_unittests_LDADD = $(top_builddir)/src/lib/util/threads/libb10-threads.la
+run_unittests_LDADD = $(top_builddir)/src/lib/util/threads/libkea-threads.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD += $(GTEST_LDADD)
 endif

+ 3 - 3
src/lib/util/unittests/Makefile.am

@@ -22,8 +22,8 @@ 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/exceptions/libb10-exceptions.la
+libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libkea-util.la
+libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
+libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 CLEANFILES = *.gcno *.gcda

+ 4 - 4
tests/tools/perfdhcp/Makefile.am

@@ -28,7 +28,7 @@ perfdhcp_SOURCES += pkt_transform.cc pkt_transform.h
 perfdhcp_SOURCES += rate_control.cc rate_control.h
 perfdhcp_SOURCES += stats_mgr.h
 perfdhcp_SOURCES += test_control.cc test_control.h
-libb10_perfdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
+libkea_perfdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
 
 perfdhcp_CXXFLAGS = $(AM_CXXFLAGS)
 if USE_CLANGPP
@@ -37,9 +37,9 @@ if USE_CLANGPP
 perfdhcp_CXXFLAGS += -Wno-unused-parameter
 endif
 
-perfdhcp_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-perfdhcp_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
-perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+perfdhcp_LDADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+perfdhcp_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 
 
 # ... and the documentation

+ 4 - 4
tests/tools/perfdhcp/tests/Makefile.am

@@ -47,10 +47,10 @@ if USE_CLANGPP
 run_unittests_CXXFLAGS = -Wno-unused-parameter
 endif
 
-run_unittests_LDADD  = $(top_builddir)/src/lib/util/libb10-util.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/util/libkea-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD += $(GTEST_LDADD)
 endif