1 files changed, 20 insertions, 10 deletions
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index b7fe65abf0..60acfed568 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
-AM_CPPFLAGS += -I$(top_srcdir)/src/lib/cc -I$(top_builddir)/src/lib/cc
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 if HAVE_MYSQL
 AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
@@ -74,19 +73,30 @@ sbin_PROGRAMS = kea-dhcp6
 kea_dhcp6_SOURCES  = main.cc
 
 kea_dhcp6_LDADD  = libdhcp6.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+kea_dhcp6_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+
+kea_dhcp6_LDFLAGS = $(CRYPTO_LDFLAGS)
+if HAVE_MYSQL
+kea_dhcp6_LDFLAGS += $(MYSQL_LIBS)
+endif
+if HAVE_PGSQL
+kea_dhcp6_LDFLAGS += $(PGSQL_LIBS)
+endif
 
 kea_dhcp6dir = $(pkgdatadir)
 kea_dhcp6_DATA = dhcp6.spec