From c73eaa30151feece9704241b8ce38e598309a702 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 15 May 2009 10:47:44 +0000 Subject: [PATCH] lo.mk: Link against $(TOOLS_DIR)/$(CPP_PREFIX)/$*.o The last commit doesn\'t work with TOOLS_DIR != . Fix this by always also linking against $(TOOLS_DIR)/$(CPP_PREFIX)/$*.o. Symbols sometimes duplicates to those in the project lib in case TOOLS_DIR != ., hence not very nice. But seems to work. --- make/lo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/lo.mk b/make/lo.mk index 67e29d8f..34fc50f0 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -32,8 +32,8 @@ clean: clean.lo clean.lo: profclean rm -f $(filter-out $(CPP_PREFIX)%.cpp,$(wildcard *.o *.cpp *.so *.done *.dll)) -$(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(CPP_PREFIX)%.o - $(CPP) -shared $^ $(LDFLAGS) -o $@ +$(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o + $(CPP) -shared $^ $(LDFLAGS) $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)$*.o) -o $@ %.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%.h echo -e "#include \"$<\"\n$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*);\n" > $@