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

Makefiles: sort result from wildcard, needed for unwise GNU make 3.82 change.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2010-09-01 14:10:14 +02:00
parent cec9778fd5
commit 9670d3341c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+2 -2
View File
@@ -49,7 +49,7 @@ exeext ?= .out
libext ?= .a libext ?= .a
objext ?= .o objext ?= .o
upx_SOURCES := $(wildcard $(srcdir)/*.cpp) upx_SOURCES := $(sort $(wildcard $(srcdir)/*.cpp))
upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext))) upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
# we need UCL and zlib - you can set envvar UPX_UCLDIR # we need UCL and zlib - you can set envvar UPX_UCLDIR
@@ -77,7 +77,7 @@ upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
%.o : %.cpp | .depend %.o : %.cpp | .depend
$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<) $(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
.depend: $(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 ($(USE_GNUC),1)
@echo "Updating $@" @echo "Updating $@"
src/stub/Makefile
+3 -1
View File
@@ -1261,7 +1261,9 @@ endif
ifndef EXTRA_MAKEFILES ifndef EXTRA_MAKEFILES
EXTRA_MAKEFILES := EXTRA_MAKEFILES :=
##ifneq ($(filter extra-%,$(MAKECMDGOALS)),) ##ifneq ($(filter extra-%,$(MAKECMDGOALS)),)
EXTRA_MAKEFILES += $(wildcard src/arch/*/Makefile.extra src/arch/*/*/Makefile.extra src/arch/*/*/*/Makefile.extra) EXTRA_MAKEFILES += $(sort $(wildcard src/arch/*/Makefile.extra))
EXTRA_MAKEFILES += $(sort $(wildcard src/arch/*/*/Makefile.extra))
EXTRA_MAKEFILES += $(sort $(wildcard src/arch/*/*/*/Makefile.extra))
####EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null) ####EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null)
##endif ##endif
endif endif