From: Yann Collet <cyan@fb.com>
Date: Thu, 20 Apr 2017 18:16:40 +0000 (-0700)
Subject: Merge branch 'dev' into compressionFlow
X-Git-Tag: v1.2.0^2~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F658%2Fhead;p=thirdparty%2Fzstd.git

Merge branch 'dev' into compressionFlow
---

16f9c572fc96cdec479784088845a768c4e2e6f6
diff --cc Makefile
index dc2ac4ce0,ae2f68867..54652665b
--- a/Makefile
+++ b/Makefile
@@@ -109,15 -109,10 +109,15 @@@ clean
  # make install is validated only for Linux, OSX, Hurd and some BSD targets
  #------------------------------------------------------------------------------
  ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))
 +
  HOST_OS = POSIX
- CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON
+ CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON
 -.PHONY: install uninstall travis-install clangtest gpptest armtest usan asan uasan
  
 +.PHONY: list
 +list:
 +	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | xargs
 +
 +.PHONY: install uninstall travis-install clangtest gpptest armtest usan asan uasan
  install:
  	@$(MAKE) -C $(ZSTDDIR) $@
  	@$(MAKE) -C $(PRGDIR) $@