summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-12-19 08:51:32 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2014-12-19 08:51:32 (GMT)
commite25b51de7b51101e04ceea194dd557fcc23c03ca (patch)
treee6b6f4e9d0363f2ac6b9fd8e6563b068bb2fa3f7 /Makefile
parenta5358e602a526b844d6872c0b46087044651feb3 (diff)
parentf68eead36c0eb8f6f4e5c912dfe204c52bb7b7c5 (diff)
downloadlz4-e25b51de7b51101e04ceea194dd557fcc23c03ca.zip
lz4-e25b51de7b51101e04ceea194dd557fcc23c03ca.tar.gz
lz4-e25b51de7b51101e04ceea194dd557fcc23c03ca.tar.bz2
Merge pull request #47 from Cyan4973/devr127r126
Dev
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile29
1 files changed, 15 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 3b1e51f..c486239 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# ################################################################
-# LZ4 library - Makefile
-# Copyright (C) Yann Collet 2011-2014
+# LZ4 - Makefile
+# Copyright (C) Yann Collet 2011-2015
# All rights reserved.
#
# BSD license
@@ -30,24 +30,22 @@
# - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
# ################################################################
-# Version numbers
-export VERSION=125
+# Version number
+export VERSION=126
export RELEASE=r$(VERSION)
DESTDIR?=
PREFIX ?= /usr
-CC := $(CC)
-CFLAGS ?= -O3
-CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\"
-LIBDIR?= $(PREFIX)/lib
+LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR=$(PREFIX)/include
-PRGDIR = programs
-LZ4DIR = lib
+PRGDIR = programs
+LZ4DIR = lib
DISTRIBNAME=lz4-$(RELEASE).tar.gz
TEXT = $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4.h $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4hc.h \
- $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4frame.h $(LZ4DIR)/xxhash.c $(LZ4DIR)/xxhash.h \
+ $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4frame.h $(LZ4DIR)/lz4frame_static.h \
+ $(LZ4DIR)/xxhash.c $(LZ4DIR)/xxhash.h \
$(LZ4DIR)/liblz4.pc.in $(LZ4DIR)/Makefile $(LZ4DIR)/LICENSE \
Makefile lz4_block_format.txt LZ4_Frame_Format.html NEWS README.md \
cmake_unofficial/CMakeLists.txt \
@@ -93,13 +91,16 @@ clean:
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
install:
- @cd $(LZ4DIR); sudo $(MAKE) -e install
- @cd $(PRGDIR); sudo $(MAKE) -e install
+ @cd $(LZ4DIR); $(MAKE) -e install
+ @cd $(PRGDIR); $(MAKE) -e install
uninstall:
@cd $(LZ4DIR); $(MAKE) uninstall
@cd $(PRGDIR); $(MAKE) uninstall
+travis-install:
+ sudo $(MAKE) install
+
dist: clean
@install -dD -m 700 lz4-$(RELEASE)/lib/
@install -dD -m 700 lz4-$(RELEASE)/programs/
@@ -119,7 +120,7 @@ dist: clean
@echo Distribution $(DISTRIBNAME) built
test:
- @cd $(PRGDIR); $(MAKE) -e $@
+ @cd $(PRGDIR); $(MAKE) -e test
test-travis: $(TRAVIS_TARGET)