From: Przemyslaw Skibinski Date: Wed, 22 Feb 2017 09:31:30 +0000 (+0100) Subject: minor tweaks X-Git-Tag: v1.1.4~1^2~52^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=337ec875b61f56cc98bf297887da80029741b8d4;p=thirdparty%2Fzstd.git minor tweaks --- diff --git a/.travis.yml b/.travis.yml index 958633de7..c1985d785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: - env: Ubu=14.04 Cmd='make gpp6install uasan-test && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan' install: - export CXX="g++-6" CC="gcc-6" - - env: Ubu=14.04 Cmd='CC=gcc-6 make gcc6install uasan-test32 && make clean zlibwrapper && make -C tests clean test-zstd-nolegacy versionsTest' + - env: Ubu=14.04 Cmd='CC=gcc-6 make gcc6install uasan-test32 && make clean zlibwrapper && make -C tests clean test-zstd-nolegacy && make -C tests versionsTest' - env: Ubu=14.04 Cmd="make arminstall armtest && make clean && make aarch64test" - env: Ubu=14.04 Cmd='make ppcinstall ppctest && make clean && make ppc64test' diff --git a/programs/Makefile b/programs/Makefile index 0a9ab5a79..db718d14c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -148,7 +148,7 @@ generate_res: windres/generate_res.bat clean: - $(MAKE) -C ../lib clean + $(MAKE) -C $(ZSTDDIR) 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) \ diff --git a/tests/Makefile b/tests/Makefile index 937ec96d3..17286a022 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -174,7 +174,7 @@ versionsTest: clean $(PYTHON) test-zstd-versions.py clean: - $(MAKE) -C ../lib clean + $(MAKE) -C $(ZSTDDIR) clean @$(RM) -fR $(TESTARTEFACT) @$(RM) -f core *.o tmp* result* *.gcda dictionary *.zst \ $(PRGDIR)/zstd$(EXT) $(PRGDIR)/zstd32$(EXT) \