From: Razvan Becheriu Date: Thu, 7 Mar 2019 10:22:08 +0000 (+0200) Subject: consistent link order, removed libraries from Makefile.am X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=489af94f96bed415a88956cd65230a8f222f81c4;p=thirdparty%2Fkea.git consistent link order, removed libraries from Makefile.am --- diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am index fa29381a28..139de40140 100644 --- a/src/bin/lfc/Makefile.am +++ b/src/bin/lfc/Makefile.am @@ -54,9 +54,8 @@ kea_lfc_SOURCES = main.cc kea_lfc_LDADD = liblfc.la kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la -kea_lfc_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la kea_lfc_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la -kea_lfc_LDADD += $(top_builddir)/src/lib/process/libkea-process.la +kea_lfc_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la kea_lfc_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la kea_lfc_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la @@ -77,6 +76,7 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/database/libkea-database.la kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la kea_lfc_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la kea_lfc_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la +kea_lfc_LDADD += $(top_builddir)/src/lib/process/libkea-process.la kea_lfc_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_lfc_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_lfc_LDADD += $(top_builddir)/src/lib/log/libkea-log.la diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am index 973ff3e581..328b260fa8 100644 --- a/src/bin/perfdhcp/Makefile.am +++ b/src/bin/perfdhcp/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS += -Werror AM_CXXFLAGS = $(KEA_CXXFLAGS) -AM_LDFLAGS = -lm +AM_LDFLAGS = if USE_STATIC_LINK AM_LDFLAGS += -static endif