From 0d9cbfe927bf335415d09720bade451de170c30c Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 2 Mar 2005 09:42:45 +0000 Subject: [PATCH] Updated. committer: mfx 1109756565 +0000 --- src/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 820d11ef..1ee26e88 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ .SUFFIXES: MAKEFLAGS += -rR -override m = $($1) $(EXTRA_$1) $(UPX_EXTRA_$1) +override e = $($1) $(EXTRA_$1) $(UPX_EXTRA_$1) srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) ifneq ($(srcdir),./) @@ -32,13 +32,13 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=.o)) all: upx.out upx.out: $(upx_OBJECTS) $(upx_DEPENDENCIES) - $(strip $(CXXLD) $(call m,CPPFLAGS) $(call m,CXXFLAGS) $(call m,LDFLAGS) -o $@ $(upx_OBJECTS) $(upx_OJBECTS) $(call m,LIBS)) + $(strip $(CXXLD) $(call e,CPPFLAGS) $(call e,CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(upx_OJBECTS) $(upx_LDADD) $(call e,LIBS)) %.o : %.cpp - $(strip $(CXX) $(call m,CPPFLAGS) $(call m,CXXFLAGS) -o $@ -c $<) + $(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<) -clean: +mostlyclean clean distclean maintainer-clean: rm -f *.d *.map *.o *.res upx.out -include *.d -.PHONY: all clean +.PHONY: all mostlyclean clean distclean maintainer-clean