From 6a3dc2d69e10a82c9997e57f81f3318aa3aff2ce Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Fri, 18 Sep 2009 18:00:49 -0300 Subject: [PATCH 1/1] Change the name of the variable storing the root build path The variable storing the root build path (where all the variants are built) is named $D. Reserve this name for the documentation directory using $(VD) instead. --- Lib.mak | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib.mak b/Lib.mak index 5889b04..f84d288 100644 --- a/Lib.mak +++ b/Lib.mak @@ -47,11 +47,11 @@ T := $(abspath $T) # Name of the current directory, relative to $T R := $(subst $T,,$(patsubst $T/%,%,$(CURDIR))) -# Base directory where to put variants -D ?= $T/build +# Base directory where to put variants (Variants Directory) +VD ?= $T/build # Generated files top directory -G ?= $D/$F +G ?= $(VD)/$F # Objects (and other garbage like pre-compiled headers and dependency files) # directory @@ -296,7 +296,7 @@ $I/lib/%: .PHONY: clean clean: - $(call exec,$(RM) -r $D,$D) + $(call exec,$(RM) -r $(VD),$(VD)) # Phony rule to uninstall all built targets (like "install", uses $(install)). .PHONY: uninstall @@ -332,8 +332,8 @@ install: $$(install) setup_build_dir__ := $(shell \ mkdir -p $O $B $L $(INCLUDE_DIR); \ mkdir -p . $(addprefix $O,$(patsubst $T%,%,\ - $(shell find $T -type d -not -path '$D*'))); \ - test -L $D/last || ln -s $F $D/last ) + $(shell find $T -type d -not -path '$(VD)*'))); \ + test -L $(VD)/last || ln -s $F $(VD)/last ) # Automatic rebuilding when flags or commands changes -- 2.43.0