From 66b5289897dae3354173c8a9e757375040291ff9 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 29 Jun 2009 15:07:19 +0000 Subject: [PATCH] lo.mk: Fix SO_PREFIX collision Fix SO_PREFIX collision, see https://jannet.de/cvs/proj/ytools/make/rules.mk.diff?r1=1.120&r2=1.121 --- make/lo.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/lo.mk b/make/lo.mk index a326915c..ea6d049d 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -1,7 +1,3 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/depend.mk - # === change this > TOOLS_DIR ?= $(TOPDIR)/tools @@ -13,6 +9,10 @@ SO_PREFIX ?= lo_ LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK # === change this < +include $(MODDIR)/make/defs.mk +include $(MODDIR)/make/rules.mk +include $(MODDIR)/make/depend.mk + .PRECIOUS: %.cpp LOADABLE_OBJS_BASE = $(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)*.h)))) LOADABLE_OBJS = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE))