More small Makefile changes.
This commit is contained in:
parent
84989ffa04
commit
2007fe5f49
4
Makefile
4
Makefile
@ -1,4 +1,6 @@
|
|||||||
# Toplevel Makefile for UPX
|
#
|
||||||
|
# UPX toplevel Makefile - needs GNU make 3.80 or better
|
||||||
|
#
|
||||||
|
|
||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|||||||
19
doc/Makefile
19
doc/Makefile
@ -1,7 +1,17 @@
|
|||||||
|
#
|
||||||
|
# UPX doc Makefile - needs GNU make 3.80 or better
|
||||||
|
#
|
||||||
|
|
||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
||||||
|
# internal make variables
|
||||||
|
comma := ,
|
||||||
|
empty :=
|
||||||
|
space := $(empty) $(empty)
|
||||||
|
tab := $(empty) $(empty)
|
||||||
|
|
||||||
# update $PATH for our special stub build tools
|
# update $PATH for our special stub build tools
|
||||||
ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
|
ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
|
||||||
export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
|
export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
|
||||||
@ -10,14 +20,19 @@ ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
|
|||||||
export PATH := $(HOME)/bin/bin-upx:$(PATH)
|
export PATH := $(HOME)/bin/bin-upx:$(PATH)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
# /***********************************************************************
|
||||||
|
# //
|
||||||
|
# ************************************************************************/
|
||||||
|
|
||||||
top_srcdir = ..
|
top_srcdir = ..
|
||||||
|
|
||||||
PACKAGE = upx
|
PACKAGE = upx
|
||||||
VERSION_DATE := $(shell sed -n 's/^.*UPX_VERSION_DATE_ISO .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
|
VERSION_DATE := $(shell sed -n 's/^.*UPX_VERSION_DATE_ISO .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
|
||||||
VERSION := $(shell sed -n 's/^.*UPX_VERSION_STRING .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
|
VERSION := $(shell sed -n 's/^.*UPX_VERSION_STRING .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
|
||||||
|
|
||||||
RTRIM := sed -e 's/[ ]*$$//'
|
RTRIM := sed -e 's/[ $(tab)]*$$//'
|
||||||
DETAB2 := sed -e 's/ / /g'
|
DETAB2 := sed -e 's/$(tab)/ /g'
|
||||||
|
|
||||||
BUILT_SOURCES = upx.1 upx.doc upx.html upx.man upx.ps upx.tex
|
BUILT_SOURCES = upx.1 upx.doc upx.html upx.man upx.ps upx.tex
|
||||||
BUILT_SOURCES = upx.1 upx.doc upx.html
|
BUILT_SOURCES = upx.1 upx.doc upx.html
|
||||||
|
|||||||
@ -12,6 +12,12 @@ MAKEFLAGS += -rR
|
|||||||
export SHELL = /bin/sh
|
export SHELL = /bin/sh
|
||||||
export LC_ALL = C
|
export LC_ALL = C
|
||||||
|
|
||||||
|
# internal make variables
|
||||||
|
comma := ,
|
||||||
|
empty :=
|
||||||
|
space := $(empty) $(empty)
|
||||||
|
tab := $(empty) $(empty)
|
||||||
|
|
||||||
ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.79 3.79.1 3.80),)
|
ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.79 3.79.1 3.80),)
|
||||||
$(error GNU make 3.81 or better is required)
|
$(error GNU make 3.81 or better is required)
|
||||||
endif
|
endif
|
||||||
@ -118,7 +124,7 @@ maintainer-clean:
|
|||||||
override T = $(basename $(notdir $@))
|
override T = $(basename $(notdir $@))
|
||||||
|
|
||||||
# trim (strip) trailing whitespace
|
# trim (strip) trailing whitespace
|
||||||
RTRIM := sed -e 's/[ ]*$$//'
|
RTRIM := sed -e 's/[ $(tab)]*$$//'
|
||||||
|
|
||||||
# clear some vars, just in case
|
# clear some vars, just in case
|
||||||
LABEL_PREFIX =
|
LABEL_PREFIX =
|
||||||
@ -712,14 +718,15 @@ endif
|
|||||||
ifndef EXTRA_MAKEFILES
|
ifndef EXTRA_MAKEFILES
|
||||||
EXTRA_MAKEFILES :=
|
EXTRA_MAKEFILES :=
|
||||||
ifneq ($(filter extra-%,$(MAKECMDGOALS)),)
|
ifneq ($(filter extra-%,$(MAKECMDGOALS)),)
|
||||||
EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null | LC_ALL=C sort -u)
|
EXTRA_MAKEFILES += $(wildcard src/arch/*/Makefile.extra src/arch/*/*/Makefile.extra src/arch/*/*/*/Makefile.extra)
|
||||||
|
##EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(strip $(EXTRA_MAKEFILES)),)
|
ifneq ($(strip $(EXTRA_MAKEFILES)),)
|
||||||
EXTRA_MAKEFILES.targets :=
|
EXTRA_MAKEFILES.targets :=
|
||||||
EXTRA_MAKEFILES.targets += $(addsuffix .~all,$(EXTRA_MAKEFILES))
|
EXTRA_MAKEFILES.targets += $(addsuffix .~all,$(sort $(EXTRA_MAKEFILES)))
|
||||||
EXTRA_MAKEFILES.targets += $(addsuffix .~clean,$(EXTRA_MAKEFILES))
|
EXTRA_MAKEFILES.targets += $(addsuffix .~clean,$(sort $(EXTRA_MAKEFILES)))
|
||||||
|
|
||||||
$(EXTRA_MAKEFILES.targets): MAKEFLAGS += --no-print-directory
|
$(EXTRA_MAKEFILES.targets): MAKEFLAGS += --no-print-directory
|
||||||
$(EXTRA_MAKEFILES.targets): $$(basename $$@)
|
$(EXTRA_MAKEFILES.targets): $$(basename $$@)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user