summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2016-12-21 14:00:43 (GMT)
committerYann Collet <cyan@fb.com>2016-12-21 14:00:43 (GMT)
commitbc0839c5df185129e899640e77a05f1c8fa595f6 (patch)
treef04600afd51a02ef83f58172132f4f5fb0708873
parent7cf0bb97b2a988cb17435780d19e145147dd9f70 (diff)
downloadlz4-bc0839c5df185129e899640e77a05f1c8fa595f6.zip
lz4-bc0839c5df185129e899640e77a05f1c8fa595f6.tar.gz
lz4-bc0839c5df185129e899640e77a05f1c8fa595f6.tar.bz2
minor fix for travis-install test
-rw-r--r--Makefile4
-rw-r--r--NEWS5
-rw-r--r--contrib/cmake_unofficial/.gitignore2
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 647ab4e..1432e6b 100644
--- a/Makefile
+++ b/Makefile
@@ -99,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
diff --git a/NEWS b/NEWS
index ff62ca8..e2f7666 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
v1.7.5
-cli : fix minor notification when using -r recursive mode
lz4cat : fix : works with relative path (#284) and stdin (#285) (reported by @beiDei8z)
+cli : fix minor notification when using -r recursive mode
+API : lz4frame : LZ4F_frameBound(0) gives upper bound of *flush() and *End() operations (#290, #280)
doc : markdown version of man page, by Takayuki Matsuoka (#279)
-build : Makefile : fix concurrency lib+exe build (#277)
+build : Makefile : fix make lib+exe concurrency (#277)
v1.7.4.2
fix : Makefile : release build compatible with PIE and customized compilation directives provided through environment variables (#274, reported by Antoine Martin)
diff --git a/contrib/cmake_unofficial/.gitignore b/contrib/cmake_unofficial/.gitignore
index 0f81929..d39505d 100644
--- a/contrib/cmake_unofficial/.gitignore
+++ b/contrib/cmake_unofficial/.gitignore
@@ -5,3 +5,5 @@ CMakeFiles
*.cmake
Makefile
liblz4.pc
+lz4c
+install_manifest.txt