Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update Makefile so that my build scripts work again.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-20 11:29:28 +02:00
parent d71db2978e
commit 3c492c3fc7
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+33 -32
View File
@@ -1,7 +1,7 @@
# #
# UPX Makefile - needs GNU make 3.81 or better # UPX Makefile - needs GNU make 3.81 or better
# #
# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer # Copyright (C) 1996-2016 Markus Franz Xaver Johannes Oberhumer
# #
# In GNU Make 4.0 this "MAKEFLAGS += -rR" is not executed immediately. # In GNU Make 4.0 this "MAKEFLAGS += -rR" is not executed immediately.
@@ -9,7 +9,18 @@
# with respect to builtin variables. So if we want to have no # with respect to builtin variables. So if we want to have no
# dependencies on the default values of builtin variables, # dependencies on the default values of builtin variables,
# then we cannot use builtin variables at all. # then we cannot use builtin variables at all.
# See: http://lists.gnu.org/archive/html/help-make/2016-08/msg00011.html
MAKEFLAGS += -rR MAKEFLAGS += -rR
ifneq ($(upx_CXX),)
CXX = $(upx_CXX)
else
CXX = g++
endif
ifneq ($(upx_CXXLD),)
CXXLD = $(upx_CXXLD)
else
CXXLD = $(CXX)
endif
.SUFFIXES: .SUFFIXES:
export SHELL = /bin/sh export SHELL = /bin/sh
@@ -32,30 +43,21 @@ ifneq ($(srcdir),.)
VPATH := . $(srcdir) VPATH := . $(srcdir)
endif endif
ifeq ($(upx_CXX),)
upx_CXX = g++
endif
ifneq ($(findstring $(firstword $(upx_CXX)),g++),)
USE_GNUC ?= 1
endif
ifeq ($(USE_GNUC),1)
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
upx_CXXFLAGS += -O0 -g CXXFLAGS += -O0 -g
else else
upx_CXXFLAGS += -O2 CXXFLAGS += -O2
LDFLAGS += -s LDFLAGS += -s
endif endif
# some gcc versions suffer over-agressive aliasing and wrapv optimization features/bugs # some gcc versions suffer over-agressive aliasing and wrapv optimization features/bugs
upx_CXXFLAGS_OPTIMIZE_STRICT_ALIASING ?= -fno-strict-aliasing CXXFLAGS_OPTIMIZE_STRICT_ALIASING ?= -fno-strict-aliasing
upx_CXXFLAGS_OPTIMIZE_WRAPV ?= -fwrapv CXXFLAGS_OPTIMIZE_WRAPV ?= -fwrapv
upx_CXXFLAGS += $(upx_CXXFLAGS_OPTIMIZE_STRICT_ALIASING) CXXFLAGS += $(CXXFLAGS_OPTIMIZE_STRICT_ALIASING)
upx_CXXFLAGS += $(upx_CXXFLAGS_OPTIMIZE_WRAPV) CXXFLAGS += $(CXXFLAGS_OPTIMIZE_WRAPV)
upx_CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wshadow -Wwrite-strings CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wshadow -Wwrite-strings
upx_CXXFLAGS_WERROR ?= -Werror CXXFLAGS_WERROR ?= -Werror
upx_CXXFLAGS += $(upx_CXXFLAGS_WERROR) CXXFLAGS += $(CXXFLAGS_WERROR)
endif CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
upx_CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
upx_CXXLD ?= $(upx_CXX)
exeext ?= .out exeext ?= .out
libext ?= .a libext ?= .a
@@ -84,33 +86,32 @@ all: upx$(exeext) | .depend
upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES) upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
$($(notdir $@).PRE_LINK_STEP) $($(notdir $@).PRE_LINK_STEP)
$(strip $(upx_CXXLD) $(call e,upx_CPPFLAGS) $(call e,upx_CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(call e,LDADD) $(call e,LIBS)) $(strip $(CXXLD) $(call e,CPPFLAGS) $(call e,CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(call e,LDADD) $(call e,LIBS))
$($(notdir $@).POST_LINK_STEP) $($(notdir $@).POST_LINK_STEP)
%.o : %.cpp | .depend %.o : %.cpp | .depend
$(strip $(upx_CXX) $(call e,upx_CPPFLAGS) $(call e,upx_CXXFLAGS) -o $@ -c $<) $(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
.depend: $(sort $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h)) $(MAKEFILE_LIST) .depend: $(sort $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h)) $(MAKEFILE_LIST)
@rm -f $@ @rm -f $@
ifeq ($(USE_GNUC),1) ifeq (1,1)
@echo "Updating $@" @echo "Updating $@"
@$(strip $(upx_CXX) $(call e,upx_CPPFLAGS) -MM) $(filter %.cpp,$^) > $@ @$(strip $(CXX) $(call e,CPPFLAGS) -MM) $(filter %.cpp,$^) > $@
else else
touch $@ touch $@
endif endif
ifeq ($(USE_GNUC),1) ##compress_lzma$(objext) : CXXFLAGS += -O3 -fomit-frame-pointer
##compress_lzma$(objext) : upx_CXXFLAGS += -O3 -fomit-frame-pointer compress_lzma$(objext) : CXXFLAGS += -Wno-cast-qual
compress_lzma$(objext) : upx_CXXFLAGS += -Wno-cast-qual compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
compress_lzma$(objext) : upx_CXXFLAGS += -Wno-shadow
ifeq ($(UPX_LZMA_VERSION),0x443) ifeq ($(UPX_LZMA_VERSION),0x443)
compress_lzma$(objext) : upx_CXXFLAGS += -Wno-non-virtual-dtor compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
compress_lzma$(objext) : upx_CXXFLAGS += -Wno-unused compress_lzma$(objext) : CXXFLAGS += -Wno-unused
endif endif
# needed for gcc-4.3: # needed for gcc-4.3:
compress_lzma$(objext) : upx_CXXFLAGS += -Wno-error compress_lzma$(objext) : CXXFLAGS += -Wno-error
endif p_mach$(objext) : CXXFLAGS += -Wno-cast-align
mostlyclean clean distclean maintainer-clean: mostlyclean clean distclean maintainer-clean: