summaryrefslogtreecommitdiffstats
path: root/programs
diff options
context:
space:
mode:
authorYann Collet <Cyan4973@users.noreply.github.com>2019-04-22 22:29:50 (GMT)
committerGitHub <noreply@github.com>2019-04-22 22:29:50 (GMT)
commitc4fe7a20476c53f9814ea990300481c2fcaaa94e (patch)
tree50f2234adab70e3a8b04fac76fe9cb8997d2450e /programs
parent15af05ffce8c4dfd441b9e42545d923321ce4dd8 (diff)
parent5e6807fd95284fcef48a976e2a28617f8ff134d7 (diff)
downloadlz4-c4fe7a20476c53f9814ea990300481c2fcaaa94e.zip
lz4-c4fe7a20476c53f9814ea990300481c2fcaaa94e.tar.gz
lz4-c4fe7a20476c53f9814ea990300481c2fcaaa94e.tar.bz2
Merge pull request #689 from JPeterMugaas/jpm-makefile
Jpm makefile - as described in https://github.com/lz4/lz4/issues/688
Diffstat (limited to 'programs')
-rw-r--r--programs/Makefile14
1 files changed, 2 insertions, 12 deletions
diff --git a/programs/Makefile b/programs/Makefile
index 92fd683..e055491 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -56,17 +56,7 @@ LZ4_VERSION=$(LIBVER)
MD2ROFF = ronn
MD2ROFF_FLAGS = --roff --warnings --manual="User Commands" --organization="lz4 $(LZ4_VERSION)"
-
-# Define *.exe as extension for Windows systems
-ifneq (,$(filter Windows%,$(OS)))
-EXT :=.exe
-VOID := nul
-else
-EXT :=
-VOID := /dev/null
-endif
-
-
+include ../Makefile.inc
default: lz4-release
@@ -109,7 +99,7 @@ clean:
#-----------------------------------------------------------------------------
# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
#-----------------------------------------------------------------------------
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32_NT-6.1 MINGW64_NT-6.1 MINGW32_NT-10.0 MINGW64_NT-10.0))
+ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32_NT% MINGW64_NT% MSYS% CYGWIN_NT%,$(shell uname)))
unlz4: lz4
ln -s lz4$(EXT) unlz4$(EXT)