quickfix (issue 124 & 125)

git-svn-id: https://lz4.googlecode.com/svn/trunk@116 650e7d94-2a16-8b24-b05c-7c0b3f6821cd

diff --git a/Makefile b/Makefile
index e130e4c..4ceacb9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
 #  - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
 # ################################################################
 
-export RELEASE=r115
+export RELEASE=r116
 LIBVER_MAJOR=1
 LIBVER_MINOR=0
 LIBVER_PATCH=0
@@ -59,9 +59,13 @@ endif
 ifeq ($(shell uname), Darwin)
        SONAME_FLAGS =
        SHARED_EXT = dylib
+       SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
+       SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
 else
        SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
        SHARED_EXT = so
+       SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
+       SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
 endif
 
 TEXT = lz4.c lz4.h lz4hc.c lz4hc.h \
@@ -81,19 +85,18 @@ default: liblz4
 
 all: liblz4 lz4programs
 
-liblz4: liblz4.a liblz4.$(SHARED_EXT)
-
 lz4programs: lz4.c lz4hc.c
        @cd $(PRGDIR); $(MAKE) -e all
 
-liblz4.a: lz4.c lz4hc.c
-       $(CC) $(CFLAGS) -c $^
-       ar rcs liblz4.a lz4.o lz4hc.o
-
-liblz4.$(SHARED_EXT): lz4.c lz4hc.c
-       $(CC) $(CFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(LIBVER)
-       @ln -s $@.$(LIBVER) $@.$(LIBVER_MAJOR)
-       @ln -s $@.$(LIBVER) $@
+liblz4: lz4.c lz4hc.c
+       @echo compiling static library
+       @$(CC) $(CFLAGS) -c $^
+       @ar rcs liblz4.a lz4.o lz4hc.o
+       @echo compiling dynamic library
+       @$(CC) $(CFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+       @echo creating versioned links
+       @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
+       @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
 
 clean:
        @rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* $(DISTRIBNAME) *.sha1
@@ -107,8 +110,8 @@ ifneq (,$(filter $(shell uname),Linux Darwin))
 install: liblz4
        @install -d -m 755 $(DESTDIR)$(LIBDIR)/ $(DESTDIR)$(INCLUDEDIR)/
        @install -m 755 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
-       @install -m 755 liblz4.$(SHARED_EXT).$(LIBVER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT).$(LIBVER)
-       @cp -a liblz4.$(SHARED_EXT).$(LIBVER_MAJOR) $(DESTDIR)$(LIBDIR)
+       @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER)
+       @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
        @cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
        @install -m 755 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
        @install -m 755 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
@@ -118,8 +121,8 @@ install: liblz4
 uninstall:
        [ -x $(DESTDIR)$(LIBDIR)/liblz4.a ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.a
        rm -f $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT)
-       rm -f $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
-       [ -x $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT).$(LIBVER) ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT).$(LIBVER)
+       rm -f $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR)
+       [ -x $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER) ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER)
        [ -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

diff --git a/NEWS b/NEWS
index 9336101..39a19f9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+r116:
+hotfix (issue 124 & 125)
+
 r115:
 Added : lz4cat utility, installed on POSX systems (issue 118)
 OS-X compatible compilation of dynamic library (issue 115)

diff --git a/programs/Makefile b/programs/Makefile
index 54a19cf..fc42ac0 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -30,11 +30,12 @@
 # fullbench32: Same as fullbench, but forced to compile in 32-bits mode
 # ################################################################
 
-RELEASE=r114
+RELEASE=r116
 DESTDIR=
 PREFIX=/usr
 CC:=$(CC)
-CFLAGS+= -I.. -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+FLAGS= -I.. $(CFLAGS)
 
 BINDIR=$(PREFIX)/bin
 MANDIR=$(PREFIX)/share/man/man1
@@ -54,25 +55,25 @@ default: lz4 lz4c
 all: lz4 lz4c lz4c32 fuzzer fuzzer32 fullbench fullbench32
 
 lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
-       $(CC)      $(CFLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
+       $(CC)      $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
 
 lz4c  : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
-       $(CC)      $(CFLAGS) $^ -o $@$(EXT)
+       $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
 lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
-       $(CC) -m32 $(CFLAGS) $^ -o $@$(EXT)
+       $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
 
 fuzzer  : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c fuzzer.c
-       $(CC)      $(CFLAGS) $^ -o $@$(EXT)
+       $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
 fuzzer32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c fuzzer.c
-       $(CC) -m32 $(CFLAGS) $^ -o $@$(EXT)
+       $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
 
 fullbench  : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c xxhash.c fullbench.c
-       $(CC)      $(CFLAGS) $^ -o $@$(EXT)
+       $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
 fullbench32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c xxhash.c fullbench.c
-       $(CC) -m32 $(CFLAGS) $^ -o $@$(EXT)
+       $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
 
 clean:
        @rm -f core *.o \
@@ -86,7 +87,7 @@ ifneq (,$(filter $(shell uname),Linux Darwin))
 install: lz4 lz4c
        @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
        @install -m 755 lz4   $(DESTDIR)$(BINDIR)/lz4
-       @ln -s $(DESTDIR)$(BINDIR)/lz4 $(DESTDIR)$(BINDIR)/lz4cat
+       @ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat
        @install -m 755 lz4c  $(DESTDIR)$(BINDIR)/lz4c
        @install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
        @echo lz4 installation completed