Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev

# Conflicts:
#	lib/Makefile

diff --cc lib/Makefile
Simple merge

diff --cc programs/Makefile
index 14b042a,6f4c8c2..07bec03
--- 1/programs/Makefile
--- 2/programs/Makefile
+++ b/programs/Makefile
@@@ -38,8 -38,14 +38,10 @@@ LIBVER_MINOR := $(shell echo $(LIBVER_M
  LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT))
  LIBVER  := $(shell echo $(LIBVER_SCRIPT))
  
 -DESTDIR ?=
 -PREFIX  ?= /usr/local
 -BINDIR  := $(PREFIX)/bin
 -MANDIR  := $(PREFIX)/share/man/man1
  LZ4DIR  := ../lib
- VOID    := /dev/null
+ 
+ SRCFILES := $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c)
+ OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
  
  CPPFLAGS+= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
  CFLAGS  ?= -O3