From 5e6807fd95284fcef48a976e2a28617f8ff134d7 Mon Sep 17 00:00:00 2001 From: JPeterMugaas Date: Mon, 22 Apr 2019 17:38:43 -0400 Subject: Make programs/Makefile use the includes. --- programs/Makefile | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index 47912d8..e055491 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -56,48 +56,7 @@ LZ4_VERSION=$(LIBVER) MD2ROFF = ronn MD2ROFF_FLAGS = --roff --warnings --manual="User Commands" --organization="lz4 $(LZ4_VERSION)" -TARGET_OS ?= $(shell uname) -ifeq ($(TARGET_OS),) - TARGET_OS ?= $(OS) -endif - -# Define *.exe as extension for Windows systems -ifneq (,$(filter Windows%,$(TARGET_OS))) -EXT :=.exe -else -ifneq (,$(filter MINGW%,$(TARGET_OS))) -EXT :=.exe -else -ifneq (,$(filter MSYS%,$(TARGET_OS))) -EXT :=.exe -else -ifneq (,$(filter CYGWIN%,$(TARGET_OS))) -EXT :=.exe -else -EXT := -endif -endif -endif -endif - -#determine if dev/nul based on host environment -ifneq (,$(filter MINGW%,$(shell uname))) -VOID := /dev/null -else -ifneq (,$(filter MSYS%,$(shell uname))) -VOID := /dev/null -else -ifneq (,$(filter CYGWIN%,$(shell uname))) -VOID := /dev/null -else -ifneq (,$(filter Windows%,$(OS))) -VOID := nul -else -VOID := /dev/null -endif -endif -endif -endif +include ../Makefile.inc default: lz4-release -- cgit v0.12