[master] Revert "[master] excluded DHCP related stuff from Makefile's"

This reverts commit 0960094a732dde31e21013c2f2ada3c2077eaf6e.

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4f602a938ef9bd09c1146e3fd1149732dd78469b..499e2097ec892a3867cbcfbd85a7a530998995ed 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \
-        xfrout usermgr zonemgr stats tests resolver sockcreator dbutil
-#      xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 dbutil
+       xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 dbutil
 
 check-recursive: all-recursive

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 499a71a31dd50844d5375f0181e0395a8edaf97e..9ebd541474a71d247d8bc0fb5a608f45d7796d29 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = exceptions util log cryptolink dns cc config acl xfr bench \
           asiolink asiodns nsas cache resolve testutils datasrc \
-          server_common python statistics
-#          server_common python dhcp statistics
+          server_common python dhcp statistics