From 96a60a52eb3e7d7a4785ad1dfc4e0abe3d0e10a1 Mon Sep 17 00:00:00 2001
From: "yann.collet.73@gmail.com"
 <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd>
Date: Wed, 8 Jan 2014 18:50:11 +0000
Subject: quickfix (issue 107 & issue 103)

git-svn-id: https://lz4.googlecode.com/svn/trunk@112 650e7d94-2a16-8b24-b05c-7c0b3f6821cd
---
 Makefile          | 11 ++++++-----
 NEWS              |  3 +++
 programs/Makefile |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fd2b9be..2fe42f9 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
 #  - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
 # ################################################################
 
-RELEASE=r111
+RELEASE=r112
 DESTDIR=
 PREFIX=/usr
 CC=gcc
@@ -61,6 +61,7 @@ SOURCES = $(TEXT) $(NONTEXT)
 
 
 default: liblz4
+	@cd $(PRGDIR); make
 
 all: liblz4 lz4programs
 
@@ -73,8 +74,8 @@ liblz4.a: lz4.c lz4hc.c
 	$(CC) -O3 -c $(CFLAGS) $^
 	ar rcs liblz4.a lz4.o lz4hc.o
 
-liblz4.so: lz4.c lz4hc.c lz4.h
-	$(CC) -shared -fPIC -Wl,--soname=liblz4.so.1 $(CFLAGS) -o $@
+liblz4.so: lz4.c lz4hc.c
+	$(CC) -shared -fPIC -Wl,--soname=liblz4.so.1 $(CFLAGS) $^ -o $@
 
 clean:
 	@rm -f core *.o *.a *.so $(DISTRIBNAME)
@@ -97,8 +98,8 @@ install: liblz4
 uninstall:
 	[ -x $(DESTDIR)$(LIBDIR)/liblz4.a ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.a
 	[ -x $(DESTDIR)$(LIBDIR)/liblz4.so ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.so
-	[ -f $(DESTDIR)$(INCLUDEDIR)/lz4.h ] && rm -f lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
-	[ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
+	[ -f $(DESTDIR)$(INCLUDEDIR)/lz4.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4.h
+	[ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
 	@echo lz4 libraries successfully uninstalled
 	@cd $(PRGDIR); make uninstall
 
diff --git a/NEWS b/NEWS
index 8090f71..a83aebe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+r112:
+quickfix
+
 r111 :
 Makefile : added capability to install libraries
 Modified Directory tree, to better separate libraries from programs.
diff --git a/programs/Makefile b/programs/Makefile
index 2bc2902..5f86d3c 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -30,11 +30,11 @@
 # fullbench32: Same as fullbench, but forced to compile in 32-bits mode
 # ################################################################
 
-RELEASE=r111
+RELEASE=r112
 DESTDIR=
 PREFIX=/usr
 CC=gcc
-CFLAGS+= -I. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+CFLAGS+= -I.. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
 
 BINDIR=$(PREFIX)/bin
 MANDIR=$(PREFIX)/share/man/man1
-- 
cgit v0.12