Switch from llvm-dlltool to mingw dlltool

Author: jkbonfield

.appveyor.yml

@@ -27,7 +27,7 @@ install:
   - set MSYSTEM=MINGW64
   - set PATH=C:/msys64/usr/bin;C:/msys64/mingw64/bin;%PATH%
   - set MINGWPREFIX=x86_64-w64-mingw32
-  - "sh -lc \"pacman -S --noconfirm --needed base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-autotools mingw-w64-x86_64-zlib mingw-w64-x86_64-bzip2 mingw-w64-x86_64-xz mingw-w64-x86_64-curl mingw-w64-x86_64-tools-git mingw-w64-x86_64-llvm\""
+  - "sh -lc \"pacman -S --noconfirm --needed base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-autotools mingw-w64-x86_64-zlib mingw-w64-x86_64-bzip2 mingw-w64-x86_64-xz mingw-w64-x86_64-curl mingw-w64-x86_64-tools-git\""
 
 build_script:
   - set HOME=.

INSTALL

@@ -283,10 +283,9 @@ compilers using pacman -S and the following package list:
 base-devel mingw-w64-x86_64-toolchain
 mingw-w64-x86_64-libdeflate mingw-w64-x86_64-zlib mingw-w64-x86_64-bzip2
 mingw-w64-x86_64-xz mingw-w64-x86_64-curl mingw-w64-x86_64-autotools
-mingw-w64-x86_64-tools-git mingw-w64-x86_64-llvm
+mingw-w64-x86_64-tools-git
 
-(Those last two install gendef and llvm-dlltool and are only needed
-for building libraries compatible with MSVC.)
+(The last is only needed for building libraries compatible with MSVC.)
 
 A working binary distribution may then be made using "./configure &&
-make win-dist".  Building without autoconf is not supported on Windows.
+make win-dist".  Building without autoconf is not supported on Windows.

Makefile

@@ -282,10 +282,10 @@ SHLIB_FLAVOUR = cygdll
 lib-shared: cyghts-$(LIBHTS_SOVERSION).dll
 else ifeq "$(findstring MSYS,$(PLATFORM))" "MSYS"
 SHLIB_FLAVOUR = dll
-lib-shared: hts-$(LIBHTS_SOVERSION).lib
+lib-shared: hts-$(LIBHTS_SOVERSION).dll hts-$(LIBHTS_SOVERSION).def hts-$(LIBHTS_SOVERSION).lib
 else ifeq "$(findstring MINGW,$(PLATFORM))" "MINGW"
 SHLIB_FLAVOUR = dll
-lib-shared: hts-$(LIBHTS_SOVERSION).lib
+lib-shared: hts-$(LIBHTS_SOVERSION).dll hts-$(LIBHTS_SOVERSION).def hts-$(LIBHTS_SOVERSION).lib
 else
 SHLIB_FLAVOUR = so
 lib-shared: libhts.so
@@ -334,7 +334,7 @@ hts-$(LIBHTS_SOVERSION).def: hts-$(LIBHTS_SOVERSION).dll
 	gendef hts-$(LIBHTS_SOVERSION).dll
 
 hts-$(LIBHTS_SOVERSION).lib: hts-$(LIBHTS_SOVERSION).def
-	llvm-dlltool -m i386:x86-64 -d hts-$(LIBHTS_SOVERSION).def -l hts-$(LIBHTS_SOVERSION).lib
+	dlltool -m i386:x86-64 -d hts-$(LIBHTS_SOVERSION).def -l hts-$(LIBHTS_SOVERSION).lib
 
 # Bundling libraries, binaries, dll dependencies, and licenses into a
 # single directory.