From bd973fd84ff998b62d081f54a07515bfffb89f05 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 23 Jul 2014 18:09:28 +0000 Subject: [PATCH] lo.mk: LOADABLE_OBJS_CPP -> LOCAL_CPP Re-use LOCAL_CPP in lo.mk, because that's the variable which decides which header dependency files are built. Signed-off-by: Jan Lindemann --- make/lo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/lo.mk b/make/lo.mk index 9a38d4b8..90654e73 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -11,11 +11,11 @@ include $(MODDIR)/make/defs.mk .PRECIOUS: %.cpp LOADABLE_OBJS_BASE = $(patsubst %$(CPP_SUFFIX),%,$(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h))))) LOADABLE_OBJS = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE)) -LOADABLE_OBJS_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) +LOCAL_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS)) OTHER_CPP_IGNORE = $(patsubst %,$(CPP_PREFIX)%.cpp,$(LOADABLE_OBJ_IGNORE)) -OTHER_CPP = $(filter-out $(LOADABLE_OBJS_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) +OTHER_CPP = $(filter-out $(LOCAL_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) ifneq ($(OTHER_CPP),) OTHER_O = $(patsubst %.cpp,%.o,$(OTHER_CPP)) OTHER_LIB = liblocal.a