From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 12 Jul 2024 13:19:50 +0000 (+0200)
Subject: Merge branch 'develop' into fix-make-depends
X-Git-Tag: release-1.8.4-rc1~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed6df934c8a7cf93a5527fae182084f759dfb3b7;p=thirdparty%2Fldns.git

Merge branch 'develop' into fix-make-depends
---

ed6df934c8a7cf93a5527fae182084f759dfb3b7
diff --cc Makefile.in
index aa6ebb32,0abba1a3..da6b3bba
--- a/Makefile.in
+++ b/Makefile.in
@@@ -187,9 -188,9 +189,9 @@@ uninstall-drill
  	test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
  
  clean-drill:
- 	$(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill drill/drill.1
+ 	$(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill$(EXEEXT) drill/drill.1
  
 -examples: setup-builddir no-examples-config-h $(LIB) $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
 +examples: no-examples-config-h $(LIB) $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
  no-examples-config-h:
  	@if test -e $(srcdir)/examples/config.h -o -e examples/config.h ; \
  	then echo "A config.h was detected in the examples subdirectory." ; \