diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | lib/.gitignore | 2 | ||||
| -rw-r--r-- | lib/Makefile | 23 | ||||
| -rw-r--r-- | lib/liblz4.pc.in | 2 | ||||
| -rw-r--r-- | programs/Makefile | 8 |
5 files changed, 20 insertions, 19 deletions
@@ -30,10 +30,6 @@ # - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c # ################################################################ -# Version number -export VERSION=132 -export RELEASE=r$(VERSION) - DESTDIR?= PREFIX ?= /usr/local diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..5d6f134 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1,2 @@ +# make install artefact +liblz4.pc diff --git a/lib/Makefile b/lib/Makefile index 52e0f95..141da01 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -31,17 +31,21 @@ # ################################################################ # Version numbers -VERSION?= 132 -LIBVER_MAJOR:=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` -LIBVER_MINOR:=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` -LIBVER_PATCH:=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` -LIBVER := $(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) +LIBVER_MAJOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` +LIBVER_MINOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` +LIBVER_PATCH_SCRIPT:=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` +LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) +LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) +LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) +LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT)) +LIBVER := $(shell echo $(LIBVER_SCRIPT)) + DESTDIR?= PREFIX ?= /usr/local CPPFLAGS= -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 -CFLAGS += -std=gnu99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes -pedantic +CFLAGS += -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) LIBDIR?= $(PREFIX)/lib @@ -66,9 +70,10 @@ default: liblz4 all: liblz4 -liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c # need to compile once with -fPIC, and once without -fPIC +liblz4: *.c @echo compiling static library - @$(AR) rcs $@.a $^ + @$(CC) $(FLAGS) -c $^ + @$(AR) rcs $@.a *.o @echo compiling dynamic library $(LIBVER) @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) @echo creating versioned links @@ -90,7 +95,7 @@ liblz4.pc: liblz4.pc.in Makefile @sed -e 's|@PREFIX@|$(PREFIX)|' \ -e 's|@LIBDIR@|$(LIBDIR)|' \ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ - -e 's|@VERSION@|$(VERSION)|' \ + -e 's|@VERSION@|$(LIBVER)|' \ $< >$@ install: liblz4 liblz4.pc diff --git a/lib/liblz4.pc.in b/lib/liblz4.pc.in index 1b29879..cb31cd7 100644 --- a/lib/liblz4.pc.in +++ b/lib/liblz4.pc.in @@ -7,7 +7,7 @@ libdir=@LIBDIR@ includedir=@INCLUDEDIR@ Name: lz4 -Description: fast lossless compression algorithm library +Description: extremely fast lossless compression algorithm library URL: http://www.lz4.org/ Version: @VERSION@ Libs: -L@LIBDIR@ -llz4 diff --git a/programs/Makefile b/programs/Makefile index bab49f7..4d8b391 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -34,17 +34,15 @@ # datagen : generates synthetic data samples for tests & benchmarks # ########################################################################## -RELEASE ?= r132 - +DESTDIR ?= +PREFIX ?= /usr/local BINDIR := $(PREFIX)/bin MANDIR := $(PREFIX)/share/man/man1 LZ4DIR := ../lib -DESTDIR ?= -PREFIX ?= /usr/local CFLAGS ?= -O3 # can select custom flags. For example : CFLAGS="-O2 -g" make CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ -DLZ4_VERSION=\"$(RELEASE)\" +CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) |