From 9670d3341c019f7daf4b928a232d2b0fa323afe8 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 1 Sep 2010 14:10:14 +0200
Subject: [PATCH] Makefiles: sort result from wildcard, needed for unwise GNU
 make 3.82 change.

---
 src/Makefile      | 4 ++--
 src/stub/Makefile | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 969c8524..88ab438b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -49,7 +49,7 @@ exeext ?= .out
 libext ?= .a
 objext ?= .o
 
-upx_SOURCES := $(wildcard $(srcdir)/*.cpp)
+upx_SOURCES := $(sort $(wildcard $(srcdir)/*.cpp))
 upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
 
 # we need UCL and zlib - you can set envvar UPX_UCLDIR
@@ -77,7 +77,7 @@ upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
 %.o : %.cpp | .depend
 	$(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 $@
 ifeq ($(USE_GNUC),1)
 	@echo "Updating $@"
diff --git a/src/stub/Makefile b/src/stub/Makefile
index cd76ed18..18be1308 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -1261,7 +1261,9 @@ endif
 ifndef EXTRA_MAKEFILES
 EXTRA_MAKEFILES :=
 ##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)
 ##endif
 endif