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

This reverts commit 0960094a732dde31e21013c2f2ada3c2077eaf6e.

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

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