diff options
| author | Przemyslaw Skibinski <inikep@gmail.com> | 2016-12-27 09:43:07 (GMT) |
|---|---|---|
| committer | Przemyslaw Skibinski <inikep@gmail.com> | 2016-12-27 09:43:07 (GMT) |
| commit | efaa9b7bc72a037bddee530b8dcaefa53c9c999d (patch) | |
| tree | 2ae32cac8cd397e2d3604d8172d18c61761496fa /Makefile | |
| parent | b22e2bed5e44f2cdacb11cf01d4a15a00bcb76ca (diff) | |
| parent | 19c0f21b000ababf11cb38e0d6154742f5e1cd83 (diff) | |
| download | lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.zip lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.tar.gz lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.tar.bz2 | |
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
# Conflicts:
# lib/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -52,7 +52,10 @@ endif .PHONY: default all lib lz4 clean test versionsTest examples -default: lib lz4-release +default: + @$(MAKE) -C $(LZ4DIR) + @$(MAKE) -C $(PRGDIR) + @cp $(PRGDIR)/lz4$(EXT) . all: @$(MAKE) -C $(LZ4DIR) $@ @@ -96,10 +99,10 @@ uninstall: @$(MAKE) -C $(PRGDIR) $@ travis-install: - $(MAKE) install PREFIX=~/install_test_dir + $(MAKE) -j1 install PREFIX=~/install_test_dir test: - $(MAKE) -C $(TESTDIR) test + $(MAKE) -C $(TESTDIR) $@ clangtest: clean clang -v |