From f8a0864c1be260eba236e976c5ee2ab7a9ea5295 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 3 Mar 2005 02:33:05 +0000 Subject: [PATCH] Final updates. Really. committer: mfx 1109817185 +0000 --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index d2112679..28841384 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ .SUFFIXES: MAKEFLAGS += -rR -override e = $($1) $(EXTRA_$1) $(upx_EXTRA_$1) $($(basename $(notdir $@)).$1) +override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1) srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) ifneq ($(srcdir),./) @@ -32,7 +32,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=.o)) all: upx.out upx.out: $(upx_OBJECTS) $(upx_DEPENDENCIES) - $(strip $(CXXLD) $(call e,CPPFLAGS) $(call e,CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(upx_OJBECTS) $(upx_LDADD) $(call e,LIBS)) + $(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 $<)