From 41f44c4e78f9e4bc3f48ab24dfbd54c51a3c66ce Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sun, 13 Mar 2005 16:34:26 +0000
Subject: [PATCH] Updated.

committer: mfx <mfx> 1110731666 +0000
---
 src/Makefile | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 28841384..1e1e38d3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,35 +10,41 @@ srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
 ifneq ($(srcdir),./)
 srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,')
 ##$(warning Info: using VPATH . $(srcdir))
-VPATH = . $(srcdir)
+VPATH := . $(srcdir)
 endif
 
+ifeq ($(CXX),)
 CXX = g++
-CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
 CXXFLAGS += -O2 -MMD
 CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror
-CXXLD = $(CXX)
+endif
+CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+CXXLD ?= $(CXX)
+
+exeext ?= .out
+libext ?= .a
+objext ?= .o
 
 # we need UCL and zlib - you can set envvar UCLDIR
 ifneq ($(wildcard $(UCLDIR)/include/ucl/ucl.h),)
 INCLUDES += -I$(UCLDIR)/include
-LIBS += $(addprefix -L,$(dir $(wildcard $(UCLDIR)/libucl.a $(UCLDIR)/src/.libs/libucl.a)))
+LIBS += $(addprefix -L,$(dir $(wildcard $(UCLDIR)/libucl$(libext) $(UCLDIR)/src/.libs/libucl$(libext))))
 endif
 LIBS += -lucl -lz
 
 upx_SOURCES := $(wildcard $(srcdir)/*.cpp)
-upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=.o))
+upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
 
-all: upx.out
+all: upx$(exeext)
 
-upx.out: $(upx_OBJECTS) $(upx_DEPENDENCIES)
+upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
 	$(strip $(CXXLD) $(call e,CPPFLAGS) $(call e,CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(call e,LDADD) $(call e,LIBS))
 
 %.o : %.cpp
 	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
 
 mostlyclean clean distclean maintainer-clean:
-	rm -f *.d *.map *.o *.obj *.res upx.exe upx.out
+	rm -f *.d *.map *.o *.obj *.res upx.exe upx.out upx.ttp upx$(exeext)
 
 -include *.d
 .PHONY: all mostlyclean clean distclean maintainer-clean