From: Sean Purcell <me@seanp.xyz>
Date: Tue, 18 Apr 2017 00:13:44 +0000 (-0700)
Subject: Compile CLI using files instead of objs
X-Git-Tag: v1.2.0^2~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F663%2Fhead;p=thirdparty%2Fzstd.git

Compile CLI using files instead of objs

This avoids conflicts between how the library was
configured and how the CLI was configured.
---

diff --git a/programs/Makefile b/programs/Makefile
index aca442644..f3140a19c 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -136,7 +136,7 @@ zstd-nogz : LZMA_MSG := $(NO_LZMA_MSG)
 xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP)
 xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD)
 zstd zstd-nogz xzstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
-zstd zstd-nogz xzstd : $(ZSTDLIB_OBJ) zstdcli.o fileio.o bench.o datagen.o dibio.o
+zstd zstd-nogz xzstd : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
 	@echo "$(THREAD_MSG)"
 	@echo "$(ZLIB_MSG)"
 	@echo "$(LZMA_MSG)"