summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYann Collet <Cyan4973@users.noreply.github.com>2016-11-03 17:49:33 (GMT)
committerGitHub <noreply@github.com>2016-11-03 17:49:33 (GMT)
commit99d11120bdbc08202f899a0ea30d6f1914eed304 (patch)
tree9c0dd17698b1c5e2e88ea7ad7769718002077fe5 /Makefile
parent46b49af37c62225c02098a3150d63a63fb0554ae (diff)
parent8847faffbf78ad7166826a56fb15902fca0e2603 (diff)
downloadlz4-99d11120bdbc08202f899a0ea30d6f1914eed304.zip
lz4-99d11120bdbc08202f899a0ea30d6f1914eed304.tar.gz
lz4-99d11120bdbc08202f899a0ea30d6f1914eed304.tar.bz2
Merge pull request #249 from inikep/dev
Dev
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 518ffbd..6997b19 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR=$(PREFIX)/include
PRGDIR = programs
LZ4DIR = lib
+TESTDIR = tests
# Define nul output
@@ -64,9 +65,9 @@ lz4:
clean:
@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
+ @$(MAKE) -C $(TESTDIR) $@ > $(VOID)
@$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
@$(MAKE) -C examples $@ > $(VOID)
- @$(MAKE) -C versionsTest $@ > $(VOID)
@$(RM) lz4$(EXT)
@echo Cleaning completed
@@ -88,7 +89,7 @@ travis-install:
sudo $(MAKE) install
test:
- $(MAKE) -C $(PRGDIR) test
+ $(MAKE) -C $(TESTDIR) test
cmake:
@cd contrib/cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
@@ -108,9 +109,10 @@ staticAnalyze: clean
armtest: clean
CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
+ CFLAGS="-O3 -Werror" $(MAKE) -C $(TESTDIR) bins CC=arm-linux-gnueabi-gcc
versionsTest: clean
- $(MAKE) -C versionsTest
+ $(MAKE) -C $(TESTDIR) $@
examples:
$(MAKE) -C $(LZ4DIR)