Cleanups.

This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-24 12:10:46 +02:00
parent 2e8b649195
commit 6f33929f91
3 changed files with 18 additions and 33 deletions
+5 -11
View File
@@ -4,12 +4,10 @@
# Copyright (C) 1996-2016 Markus Franz Xaver Johannes Oberhumer
#
# In GNU Make 4.0 this "MAKEFLAGS += -rR" is not executed immediately.
# Instead, it is executed later, and we cannot rely on sequentiality
# with respect to builtin variables. So if we want to have no
# dependencies on the default values of builtin variables,
# then we cannot use builtin variables at all.
# See: http://lists.gnu.org/archive/html/help-make/2016-08/msg00011.html
# build configuration options
#USE_DEBUG = 1
#USE_SANITIZE = 1
MAKEFLAGS += -r
ifneq ($(upx_CXX),)
CXX = $(upx_CXX)
@@ -20,10 +18,6 @@ else
CXXLD = $(CXX)
endif
# build configuration options
#USE_DEBUG = 1
#USE_SANITIZE = 1
.SUFFIXES:
export SHELL = /bin/sh
override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1)
@@ -104,7 +98,7 @@ ifeq (1,1)
@echo "Updating $@"
@$(strip $(CXX) $(call e,CPPFLAGS) -MM) $(filter %.cpp,$^) > $@
else
touch $@
@echo "timestamp" > $@
endif