minor tweaks

diff --git a/.travis.yml b/.travis.yml
index 958633de7e5e15ef532b01cf792dd6f9f1504895..c1985d7858e9fe203c2cd21f50d18457a3315a77 100644 (file)
--- 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 0a9ab5a79ee5f0d3e2d55e2c32a12afbf3eb773a..db718d14c44e92ff867150b7592c2daacfdd05e1 100644 (file)
--- 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 937ec96d3495f9c641512e93d8115ddeeda83c64..17286a02278e7a1a5250ce3e6a68637bf228d63c 100644 (file)
--- 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) \