From: Yann Collet <cyan@fb.com>
Date: Sat, 19 Aug 2017 07:48:29 +0000 (-0700)
Subject: fixed zstd-small
X-Git-Tag: v1.3.1^2~5^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b387729b6d1e977fd2e215b93e2cb96d246e03b;p=thirdparty%2Fzstd.git

fixed zstd-small

and added it to shortest for CI tests
---

diff --git a/programs/.gitignore b/programs/.gitignore
index eeaf051d6..461f70844 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -3,6 +3,8 @@ zstd
 zstd32
 zstd-compress
 zstd-decompress
+zstd-frugal
+zstd-small
 
 # Object files
 *.o
diff --git a/programs/Makefile b/programs/Makefile
index 2b766fb3a..886cb8119 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -139,7 +139,7 @@ default: zstd-release
 all: zstd
 
 .PHONY: allVariants
-allVariants: zstd zstd-compress zstd-decompress
+allVariants: zstd zstd-compress zstd-decompress zstd-small
 
 $(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
 
@@ -202,9 +202,9 @@ zstd-pgo : clean zstd
 	$(MAKE) zstd MOREFLAGS=-fprofile-use
 
 # minimal target, with only zstd compression and decompression. no bench. no legacy.
-zstd-small: CFLAGS = "-Os -s"
+zstd-small: CFLAGS = -Os -s
 zstd-frugal zstd-small: $(ZSTD_FILES) zstdcli.c fileio.c
-	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT $^ -o zstd$(EXT)
+	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT $^ -o $@$(EXT)
 
 zstd-decompress: $(ZSTDCOMMON_FILES) $(ZSTDDECOMP_FILES) zstdcli.c fileio.c
 	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS $^ -o $@$(EXT)
@@ -225,6 +225,7 @@ clean:
 	@$(RM) $(ZSTDDIR)/decompress/*.o $(ZSTDDIR)/decompress/zstd_decompress.gcda
 	@$(RM) core *.o tmp* result* *.gcda dictionary *.zst \
         zstd$(EXT) zstd32$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) \
+        zstd-small$(EXT) zstd-frugal$(EXT) \
         *.gcda default.profraw have_zlib$(EXT)
 	@echo Cleaning completed
 
@@ -301,4 +302,5 @@ uninstall:
 	@$(RM) $(DESTDIR)$(MANDIR)/unzstd.1
 	@$(RM) $(DESTDIR)$(MANDIR)/zstd.1
 	@echo zstd programs successfully uninstalled
+
 endif