From e06fcd903909c96a72d1025a81ff8fb31ac572fb Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Fri, 4 Nov 2016 13:32:36 +0100 Subject: redefined VOID for Windows/MSYS --- Makefile | 7 +++---- programs/Makefile | 3 +-- tests/Makefile | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6997b19..e98aafd 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,9 @@ # - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c # ################################################################ -DESTDIR?= -PREFIX ?= /usr/local +DESTDIR ?= +PREFIX ?= /usr/local +VOID := /dev/null LIBDIR ?= $(PREFIX)/lib INCLUDEDIR=$(PREFIX)/include @@ -43,10 +44,8 @@ TESTDIR = tests # Define nul output ifneq (,$(filter Windows%,$(OS))) EXT = .exe -VOID = nul else EXT = -VOID = /dev/null endif diff --git a/programs/Makefile b/programs/Makefile index ba01b40..531533c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -29,6 +29,7 @@ DESTDIR ?= PREFIX ?= /usr/local +VOID := /dev/null BINDIR := $(PREFIX)/bin MANDIR := $(PREFIX)/share/man/man1 LZ4DIR := ../lib @@ -43,10 +44,8 @@ FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) # Define *.exe as extension for Windows systems ifneq (,$(filter Windows%,$(OS))) EXT =.exe -VOID = nul else EXT = -VOID = /dev/null endif diff --git a/tests/Makefile b/tests/Makefile index 0c44b21..f8d7015 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -33,6 +33,7 @@ DESTDIR ?= PREFIX ?= /usr/local +VOID := /dev/null BINDIR := $(PREFIX)/bin MANDIR := $(PREFIX)/share/man/man1 LZ4DIR := ../lib @@ -50,10 +51,8 @@ FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) # Define *.exe as extension for Windows systems ifneq (,$(filter Windows%,$(OS))) EXT =.exe -VOID = nul else EXT = -VOID = /dev/null endif -- cgit v0.12