From 08df4f420a90bb8b3fd4f6453a9701607c4a26c8 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 16 Dec 2020 11:02:36 +1100 Subject: [PATCH 1/2] Reorder in library dependancy order --- bin/tools/Makefile.am | 11 +++++------ lib/bind9/Makefile.am | 6 +++--- lib/isccfg/Makefile.am | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am index 721aeb4e2e..0c0f18b0b2 100644 --- a/bin/tools/Makefile.am +++ b/bin/tools/Makefile.am @@ -5,8 +5,8 @@ AM_CPPFLAGS += \ $(LIBDNS_CFLAGS) LDADD = \ - $(LIBISC_LIBS) \ - $(LIBDNS_LIBS) + $(LIBDNS_LIBS) \ + $(LIBISC_LIBS) bin_PROGRAMS = \ arpaname \ @@ -23,9 +23,9 @@ mdig_CPPFLAGS = \ $(LIBBIND9_CFLAGS) mdig_LDADD = \ - $(LIBISC_LIBS) \ + $(LIBBIND9_LIBS) \ $(LIBDNS_LIBS) \ - $(LIBBIND9_LIBS) + $(LIBISC_LIBS) if HAVE_DNSTAP bin_PROGRAMS += \ @@ -37,8 +37,8 @@ dnstap_read_CPPFLAGS = \ -I$(top_builddir)/lib/dns dnstap_read_LDADD = \ - $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ + $(LIBISC_LIBS) \ $(DNSTAP_LIBS) endif @@ -52,7 +52,6 @@ named_nzd2nzf_CFLAGS = \ named_nzd2nzf_LDADD = \ $(LIBISC_LIBS) \ - $(LIBDNS_LIBS) \ $(LMDB_LIBS) endif diff --git a/lib/bind9/Makefile.am b/lib/bind9/Makefile.am index 6b7edf8c9a..f981c9216d 100644 --- a/lib/bind9/Makefile.am +++ b/lib/bind9/Makefile.am @@ -21,10 +21,10 @@ libbind9_la_CPPFLAGS = \ $(LIBBIND9_CFLAGS) libbind9_la_LIBADD = \ - $(LIBISC_LIBS) \ - $(LIBDNS_LIBS) \ $(LIBNS_LIBS) \ - $(LIBISCCFG_LIBS) + $(LIBISCCFG_LIBS) \ + $(LIBDNS_LIBS) \ + $(LIBISC_LIBS) libbind9_la_LDFLAGS = \ $(AM_LDFLAGS) \ diff --git a/lib/isccfg/Makefile.am b/lib/isccfg/Makefile.am index 09b8a7065b..a9853decfc 100644 --- a/lib/isccfg/Makefile.am +++ b/lib/isccfg/Makefile.am @@ -27,8 +27,8 @@ libisccfg_la_CPPFLAGS = \ $(LIBDNS_CFLAGS) libisccfg_la_LIBADD = \ - $(LIBISC_LIBS) \ - $(LIBDNS_LIBS) + $(LIBDNS_LIBS) \ + $(LIBISC_LIBS) libisccfg_la_LDFLAGS = \ $(AM_LDFLAGS) \ From 77372e9e24bc2cc116cfe64b4ec5b2159198a791 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 16 Dec 2020 11:04:43 +1100 Subject: [PATCH 2/2] Handle shared library platforms that don't support inter library dependancies --- bin/tools/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am index 0c0f18b0b2..ff9bef39e9 100644 --- a/bin/tools/Makefile.am +++ b/bin/tools/Makefile.am @@ -24,6 +24,7 @@ mdig_CPPFLAGS = \ mdig_LDADD = \ $(LIBBIND9_LIBS) \ + $(LIBISCCFG_LIBS) \ $(LIBDNS_LIBS) \ $(LIBISC_LIBS)