From 8e9b5f14af6a75604dfeff1306f8b22f7e491b98 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 11 Jul 2007 07:03:05 +0200
Subject: [PATCH] Small Makefile updates.

---
 src/Makefile                                       | 11 +++--------
 src/stub/src/arch/amd64/Makefile.extra             |  2 +-
 src/stub/src/arch/arm/v4a/Makefile.extra           |  2 +-
 src/stub/src/arch/arm/v4t/Makefile.extra           |  2 +-
 src/stub/src/arch/i086/Makefile.extra              |  2 +-
 src/stub/src/arch/i386/Makefile.extra              |  2 +-
 src/stub/src/arch/m68k/m68000/Makefile.extra       |  2 +-
 src/stub/src/arch/m68k/m68020/Makefile.extra       |  2 +-
 src/stub/src/arch/mips/mipsel.r3000/Makefile.extra |  2 +-
 src/stub/src/arch/powerpc/32/Makefile.extra        |  2 +-
 src/stub/src/c/{Makedefs.lzma => Makevars.lzma}    |  4 +++-
 11 files changed, 15 insertions(+), 18 deletions(-)
 rename src/stub/src/c/{Makedefs.lzma => Makevars.lzma} (71%)

diff --git a/src/Makefile b/src/Makefile
index 455f310c..b8dae5ff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,13 +55,8 @@ INCLUDES += -I$(UPX_UCLDIR)/include
 LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
 endif
 LIBS += -lucl -lz
-# you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK lzma443.tar.bz2
-# NOTE: only version 4.43 is currently sufficiently tested !
-ifneq ($(wildcard $(UPX_LZMADIR)/CPP/7zip/.),)
-UPX_LZMA_VERSION = 0x449
-else ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
-UPX_LZMA_VERSION = 0x443
-endif
+# you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 DEFS += -DWITH_LZMA=$(UPX_LZMA_VERSION)
 INCLUDES += -I$(UPX_LZMADIR)
@@ -92,9 +87,9 @@ endif
 ifeq ($(USE_GNUC),1)
 ##compress_lzma$(objext) : CXXFLAGS += -O3 -fomit-frame-pointer
 compress_lzma$(objext) : CXXFLAGS += -Wno-cast-qual
+compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
 ifeq ($(UPX_LZMA_VERSION),0x443)
 compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
-compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
 compress_lzma$(objext) : CXXFLAGS += -Wno-unused
 endif
 # needed for gcc-4.3:
diff --git a/src/stub/src/arch/amd64/Makefile.extra b/src/stub/src/arch/amd64/Makefile.extra
index 5c2864ab..d8ee149a 100644
--- a/src/stub/src/arch/amd64/Makefile.extra
+++ b/src/stub/src/arch/amd64/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/arm/v4a/Makefile.extra b/src/stub/src/arch/arm/v4a/Makefile.extra
index 16b9191a..00b4d72d 100644
--- a/src/stub/src/arch/arm/v4a/Makefile.extra
+++ b/src/stub/src/arch/arm/v4a/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/arm/v4t/Makefile.extra b/src/stub/src/arch/arm/v4t/Makefile.extra
index 5c9504ad..6bc485af 100644
--- a/src/stub/src/arch/arm/v4t/Makefile.extra
+++ b/src/stub/src/arch/arm/v4t/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/i086/Makefile.extra b/src/stub/src/arch/i086/Makefile.extra
index ab322212..d6ee3e5e 100644
--- a/src/stub/src/arch/i086/Makefile.extra
+++ b/src/stub/src/arch/i086/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 ifneq ($(wildcard $(WATCOM)/binl/wcl),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
diff --git a/src/stub/src/arch/i386/Makefile.extra b/src/stub/src/arch/i386/Makefile.extra
index 9efab0ac..ab9589a3 100644
--- a/src/stub/src/arch/i386/Makefile.extra
+++ b/src/stub/src/arch/i386/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/m68k/m68000/Makefile.extra b/src/stub/src/arch/m68k/m68000/Makefile.extra
index 40155780..94c3bdf6 100644
--- a/src/stub/src/arch/m68k/m68000/Makefile.extra
+++ b/src/stub/src/arch/m68k/m68000/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/m68k/m68020/Makefile.extra b/src/stub/src/arch/m68k/m68020/Makefile.extra
index bc1c5816..f7bd8ce3 100644
--- a/src/stub/src/arch/m68k/m68020/Makefile.extra
+++ b/src/stub/src/arch/m68k/m68020/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
index 1ce26546..6d1ebe60 100644
--- a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
+++ b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/arch/powerpc/32/Makefile.extra b/src/stub/src/arch/powerpc/32/Makefile.extra
index a15d533c..1b5b64f8 100644
--- a/src/stub/src/arch/powerpc/32/Makefile.extra
+++ b/src/stub/src/arch/powerpc/32/Makefile.extra
@@ -12,7 +12,7 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 vpath %.c $(top_srcdir)/src/stub/src/c
 
 STUBS =
-include $(top_srcdir)/src/stub/src/c/Makedefs.lzma
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
 ifneq ($(UPX_LZMA_VERSION),)
 STUBS += lzma_d_cf.S lzma_d_cs.S
 endif
diff --git a/src/stub/src/c/Makedefs.lzma b/src/stub/src/c/Makevars.lzma
similarity index 71%
rename from src/stub/src/c/Makedefs.lzma
rename to src/stub/src/c/Makevars.lzma
index fed65166..2b3efbae 100644
--- a/src/stub/src/c/Makedefs.lzma
+++ b/src/stub/src/c/Makevars.lzma
@@ -1,4 +1,6 @@
-# you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
+# you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK lzma443.tar.bz2
+# NOTE: only version 4.43 is currently sufficiently tested !
+
 ifneq ($(wildcard $(UPX_LZMADIR)/CPP/7zip/.),)
 UPX_LZMA_VERSION = 0x449
 else ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)