fixed libzstd.dll compilation on mingw

and zstd linking

diff --git a/lib/Makefile b/lib/Makefile
index 8924bfb4324f5b38b96630db7a4786275e6cee6c..1f10c7ab1b16425bd21e970a0102c3f3623bdf97 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -236,8 +236,8 @@ libzstd.a: $(ZSTD_STATLIB_DIR)/libzstd.a
 ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
 
 LIBZSTD = dll\libzstd.dll
-$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): | $(ZSTD_DYNLIB_DIR)
-$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_FILES)
+$(LIBZSTD):
+$(LIBZSTD): $(ZSTD_FILES)
        @echo compiling dynamic library $(LIBVER)
        $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll\libzstd.dll.a -shared $^ -o $@
 
@@ -254,12 +254,12 @@ $(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_DYNLIB_OBJ)
        $(Q)ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
        $(Q)ln -sf $@ libzstd.$(SHARED_EXT)
 
-endif
-
 .PHONY: $(LIBZSTD)  # must be run every time
 $(LIBZSTD): $(ZSTD_DYNLIB_DIR)/$(LIBZSTD)
        $(Q)ln -sf $< $@
 
+endif
+
 .PHONY: libzstd
 libzstd : $(LIBZSTD)
 

diff --git a/programs/Makefile b/programs/Makefile
index 575931f8c5922c133bde3420e4c7596aee4be6bc..70fb2c32d1760240fa231b9966eb049fd0651014 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -217,7 +217,7 @@ ifneq (,$(filter Windows%,$(OS)))
 zstd : $(RES_FILE)
 endif
 zstd : $(BUILD_DIR)/zstd
-       $(Q)ln -sf $^ $@
+       $(Q)ln -sf $< $@
        @echo zstd build completed
 
 .PHONY: zstd-release