janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 13:03:58 +01:00
Code Activity

Everywhere: Rename MODDIR -> JWBDIR

Browse source 
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:34:18 +00:00
commit b2d6e6f554
109 changed files with 279 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

20
make/run.mk
View file

@ -3,8 +3,8 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-cpp.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/defs-cpp.mk
DIR_BASENAME = $(notdir $(CWD))
@ -38,10 +38,10 @@ FINAL_CXXFLAGS += -DEXE_NAME=\"$(EXE)\"
# ----- linker scripts from tagged templates
#BUILD_LD_DIR = $(wildcard $(firstword $(call $(TAGGED_TMPL_DIRS),ld)))
#BUILD_LD_DIR = $(firstword $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(wildcard $(repo)/$(tag)/ld))))
#BUILD_LD_DIR = $(firstword $(wildcard $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(repo)/$(tag)/ld))))
#BUILD_LD_DIR = $(firstword $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(JWBDIR)/tmpl/tagged,$(wildcard $(repo)/$(tag)/ld))))
#BUILD_LD_DIR = $(firstword $(wildcard $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(JWBDIR)/tmpl/tagged,$(repo)/$(tag)/ld))))
#BUILD_LD_TMPL_DIRS ?= $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(repo)/$(tag)/ld))
#BUILD_LD_TMPL_DIRS ?= $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(JWBDIR)/tmpl/tagged,$(repo)/$(tag)/ld))
#BUILD_LD_DIRS += $(wildcard $(BUILD_LD_TMPL_DIRS))
#FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld)))))
@ -49,12 +49,12 @@ BUILD_LD_DIRS = $(call uniq,$(dir $(foreach d,$(BUILD_LD_CHECK_DI
LD_SCRIPTS = $(foreach d,$(BUILD_LD_DIRS),$(wildcard $(d)/*.ld))
FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld)))))
include $(MODDIR)/make/profiler.mk
include $(JWBDIR)/make/profiler.mk
BUILD_HDR =
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/ldlibpath.mk
include $(MODDIR)/make/path-rules.mk
include $(MODDIR)/make/debugger.mk
include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/ldlibpath.mk
include $(JWBDIR)/make/path-rules.mk
include $(JWBDIR)/make/debugger.mk
EXE_ARGS += $(LOCAL_EXE_ARGS)