diff options
| author | Przemyslaw Skibinski <inikep@gmail.com> | 2017-03-10 19:43:53 (GMT) |
|---|---|---|
| committer | Przemyslaw Skibinski <inikep@gmail.com> | 2017-03-10 19:43:53 (GMT) |
| commit | 517d446d7ecdb3915e71b04a70514eef3f4ec765 (patch) | |
| tree | eca5d5041282d6a532529f95990d1f1f593a9627 | |
| parent | d3eaf788380d430217bd5f4efe2feed30662892a (diff) | |
| parent | 9141ada8de016b201520c009cbfff527b8c3c119 (diff) | |
| download | lz4-517d446d7ecdb3915e71b04a70514eef3f4ec765.zip lz4-517d446d7ecdb3915e71b04a70514eef3f4ec765.tar.gz lz4-517d446d7ecdb3915e71b04a70514eef3f4ec765.tar.bz2 | |
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
| -rw-r--r-- | LICENSE | 14 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile | 6 |
3 files changed, 9 insertions, 13 deletions
@@ -3,13 +3,9 @@ This repository uses 2 different licenses : - all other files use a GPLv2 license, unless explicitly stated otherwise Relevant license is reminded at the top of each source file, -and with the presence of COPYING or LICENSE file. +and with presence of COPYING or LICENSE file in associated directories. -This model emphasizes the fact that -only files in the `lib` directory are designed to be included into 3rd party projects. - -Other files, such as those from `programs` or `examples` directory, -are not intended to be compiled outside of their context. -They can serve as source of inspiration, -but they should not be copy/pasted into 3rd party projects, -as this scenario is not supported. +This model is selected to emphasize that +files in the `lib` directory are designed to be included into 3rd party applications, +while all other files, in `programs`, `tests` or `examples`, +receive more limited attention and support for such scenario. diff --git a/lib/Makefile b/lib/Makefile index 7ba9ccb..c4bc7d2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -143,7 +143,7 @@ liblz4.pc: liblz4.pc.in Makefile $< >$@ install: lib liblz4.pc - @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ + @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ $(DESTDIR)$(LIBDIR)/ @$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ @echo Installing libraries ifeq ($(BUILD_STATIC),yes) diff --git a/tests/Makefile b/tests/Makefile index ebab278..d68c700 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -235,19 +235,19 @@ test-lz4-basic: lz4 datagen unlz4 lz4cat ./datagen -g33M | $(LZ4) --no-frame-crc | $(LZ4) -t ./datagen -g256MB | $(LZ4) -vqB4D | $(LZ4) -t @echo "hello world" > tmp - $(LZ4) --rm -f tmp + $(LZ4) --rm -f tmp tmp.lz4 test ! -f tmp # must fail (--rm) test -f tmp.lz4 $(PRGDIR)/lz4cat tmp.lz4 # must display hello world test -f tmp.lz4 - $(PRGDIR)/unlz4 --rm tmp.lz4 + $(PRGDIR)/unlz4 --rm tmp.lz4 tmp test -f tmp test ! -f tmp.lz4 # must fail (--rm) test ! -f tmp.lz4.lz4 # must fail (unlz4) $(PRGDIR)/lz4cat tmp # pass-through mode test -f tmp test ! -f tmp.lz4 # must fail (lz4cat) - $(LZ4) tmp # creates tmp.lz4 + $(LZ4) tmp tmp.lz4 # creates tmp.lz4 $(PRGDIR)/lz4cat < tmp.lz4 > tmp3 # checks lz4cat works with stdin (#285) $(DIFF) -q tmp tmp3 $(PRGDIR)/lz4cat < tmp > tmp2 # checks lz4cat works with stdin (#285) |