summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2016-11-22 19:52:43 (GMT)
committerYann Collet <cyan@fb.com>2016-11-22 19:52:43 (GMT)
commitf4c74e6fac82d090d4511dc2d83b09725ff5e639 (patch)
tree4e8fb50f503c1fb130cb0034189ad64e54e6d6ca
parentedc132b69f0f653029e79ecdbf0a5335ea4ed0ea (diff)
downloadlz4-f4c74e6fac82d090d4511dc2d83b09725ff5e639.zip
lz4-f4c74e6fac82d090d4511dc2d83b09725ff5e639.tar.gz
lz4-f4c74e6fac82d090d4511dc2d83b09725ff5e639.tar.bz2
library release build compatible with environment variable
-rw-r--r--lib/Makefile41
-rw-r--r--programs/Makefile2
2 files changed, 22 insertions, 21 deletions
diff --git a/lib/Makefile b/lib/Makefile
index a9c7df8..2b47fb0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -38,22 +38,23 @@ LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCR
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))
+LIBVER := $(shell echo $(LIBVER_SCRIPT))
BUILD_STATIC:= yes
-DESTDIR?=
-PREFIX ?= /usr/local
-CPPFLAGS= -DXXH_NAMESPACE=LZ4_
-CFLAGS ?= -O3
-CFLAGS += -g -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
- -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
- -Wpointer-arith -Wstrict-aliasing=1
+DESTDIR ?=
+PREFIX ?= /usr/local
+LIBDIR ?= $(PREFIX)/lib
+INCLUDEDIR=$(PREFIX)/include
+
+CPPFLAGS+= -DXXH_NAMESPACE=LZ4_
+CFLAGS ?= -O3
+DEBUGFLAGS:=-g -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
+ -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
+ -Wpointer-arith -Wstrict-aliasing=1
CFLAGS += $(MOREFLAGS)
-FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-LIBDIR?= $(PREFIX)/lib
-INCLUDEDIR=$(PREFIX)/include
# OS X linker doesn't support -soname, and use different extension
@@ -72,16 +73,16 @@ endif
default: lib-release
+lib-release: liblz4.a liblz4
+
+lib: CFLAGS += $(DEBUGFLAGS)
+lib: lib-release
+
all: lib
all32: CFLAGS+=-m32
all32: all
-lib: liblz4.a liblz4
-
-lib-release: CFLAGS := -O3
-lib-release: lib
-
liblz4.a: *.c
ifeq ($(BUILD_STATIC),yes)
@echo compiling static library
@@ -114,10 +115,10 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
liblz4.pc: liblz4.pc.in Makefile
@echo creating pkgconfig
@sed -e 's|@PREFIX@|$(PREFIX)|' \
- -e 's|@LIBDIR@|$(LIBDIR)|' \
- -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
- -e 's|@VERSION@|$(LIBVER)|' \
- $< >$@
+ -e 's|@LIBDIR@|$(LIBDIR)|' \
+ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
+ -e 's|@VERSION@|$(LIBVER)|' \
+ $< >$@
install: lib liblz4.pc
@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
diff --git a/programs/Makefile b/programs/Makefile
index caef394..504416f 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -36,7 +36,7 @@ VOID := /dev/null
CPPFLAGS+= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
CFLAGS ?= -O3
-DEBUGFLAGS=-g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow \
+DEBUGFLAGS:=-g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow \
-Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes \
-Wpointer-arith -Wstrict-aliasing=1
CFLAGS += $(MOREFLAGS)