Merge branch 'develop' into fix-make-depends

diff --cc Makefile.in
index aa6ebb321cbb2735a30b81ab0eed76b6d8929acc,0abba1a3ff57ca2b511a2836d356178317bf67c8..da6b3bba4ef8a9e2f8d5b7c840ef160e213bc43e
--- 1/Makefile.in
--- 2/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." ; \