From fec5cc864e65c8df8fdf2f590928b0761f416caf Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Fri, 23 Jun 2006 01:02:47 +0200
Subject: [PATCH] Update Makefile.

---
 src/Makefile | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index efe91b3f..3cb62c96 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,8 +21,12 @@ ifeq ($(firstword $(CXX)),g++)
 USE_GNUC ?= 1
 endif
 ifeq ($(USE_GNUC),1)
-##CXXFLAGS += -O2 -MMD
-CXXFLAGS += -O0 -g -MMD
+CXXFLAGS += -MMD
+ifeq ($(DEBUG),1)
+CXXFLAGS += -O0 -g
+else
+CXXFLAGS += -O2
+endif
 CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror
 ##CXXFLAGS += -Wshadow
 endif
@@ -76,18 +80,18 @@ $(upx_OBJECTS_LUA) : lua_%.o : $(UPX_LUADIR)/src/%.c
 
 
 ifeq ($(USE_GNUC),1)
-##compress_lzma$(objext) : EXTRA_CXXFLAGS += -O3 -fomit-frame-pointer
-compress_lzma$(objext) : EXTRA_CXXFLAGS += -Wno-cast-qual
-compress_lzma$(objext) : EXTRA_CXXFLAGS += -Wno-non-virtual-dtor
-compress_lzma$(objext) : EXTRA_CXXFLAGS += -Wno-shadow
-compress_lzma$(objext) : EXTRA_CXXFLAGS += -Wno-unused
-##compress_lzma$(objext) : EXTRA_CXXFLAGS += -Wno-error
+##compress_lzma$(objext) : CXXFLAGS += -O3 -fomit-frame-pointer
+compress_lzma$(objext) : CXXFLAGS += -Wno-cast-qual
+compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
+compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
+compress_lzma$(objext) : CXXFLAGS += -Wno-unused
+##compress_lzma$(objext) : CXXFLAGS += -Wno-error
 endif
 
 ifeq ($(USE_GNUC),1)
-$(upx_OBJECTS_LUA)     : EXTRA_CXXFLAGS += -Wno-cast-align
-$(upx_OBJECTS_LUA)     : EXTRA_CXXFLAGS += -Wno-cast-qual
-$(upx_OBJECTS_LUA)     : EXTRA_CXXFLAGS += -Wno-error
+$(upx_OBJECTS_LUA)     : CXXFLAGS += -Wno-cast-align
+$(upx_OBJECTS_LUA)     : CXXFLAGS += -Wno-cast-qual
+$(upx_OBJECTS_LUA)     : CXXFLAGS += -Wno-error
 endif