summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/TFbuild.enter (renamed from build/TFbuild.prologue)0
-rw-r--r--build/TFbuild.leave (renamed from build/TFbuild.epilogue)2
-rw-r--r--build/TFbuild.main10
3 files changed, 6 insertions, 6 deletions
diff --git a/build/TFbuild.prologue b/build/TFbuild.enter
index 2878ca0..2878ca0 100644
--- a/build/TFbuild.prologue
+++ b/build/TFbuild.enter
diff --git a/build/TFbuild.epilogue b/build/TFbuild.leave
index af0baad..ee71fab 100644
--- a/build/TFbuild.epilogue
+++ b/build/TFbuild.leave
@@ -11,7 +11,7 @@ $(foreach m,$(progs-y),$(eval $(call CreateProgram,$(m))))
# Handle subdir of this subdir
subdirs--$(recursion-level) := $(addsuffix /,$(subdirs-y))
-include $(subdirs-y:%=$(build-prologue) $(current-dir)%/TFbuild $(build-epilogue))
+include $(subdirs-y:%=$(build-enter) $(current-dir)%/TFbuild $(build-leave))
# And restore parent context
$(foreach m,$(local-vars),$(eval $(call MemoizeAndPopVariable,$(m))))
diff --git a/build/TFbuild.main b/build/TFbuild.main
index f0c061b..b33aa49 100644
--- a/build/TFbuild.main
+++ b/build/TFbuild.main
@@ -40,8 +40,8 @@ LDFLAGS_ALL ?= -g
# some helpers
PHONY:=all libs progs allobjdirs arguments-changed
-build-prologue:=$(TFBUILD)TFbuild.prologue
-build-epilogue:=$(TFBUILD)TFbuild.epilogue
+build-enter:=$(TFBUILD)TFbuild.enter
+build-leave:=$(TFBUILD)TFbuild.leave
comma:=,
squote:='
empty:=
@@ -75,6 +75,7 @@ current-dirc :=
recursion-level = $(words $(current-dirc))
next-recursion-level = $(words $(current-dirc) dummy)
objdir = $(objtree)$(current-dir)
+srcdir = $(srctree)$(current-dir)
# globals
all-progs :=
@@ -176,8 +177,7 @@ $(objtree)%.o: $(srctree)%.c $$(call arg-check-prereq,cc_o_c) |allobjdirs
# AR static library archiver
quiet_cmd_ar = AR $(printable-target)
- cmd_ar = $(AR) -r $@ $? 2> /dev/null && \
- $(RANLIB) $@
+ cmd_ar = $(AR) -rs $@ $? 2> /dev/null
define CreateLibrary
all-libs += $(objdir)$(1).a
@@ -216,7 +216,7 @@ FULL_VERSION := $(VERSION)
endif
# include the main directory's TFbuild
-include $(build-prologue) TFbuild $(build-epilogue)
+include $(build-enter) TFbuild $(build-leave)
# debug dump all variables
#$(foreach VAR,$(sort $(.VARIABLES)),$(warning $(VAR)=$($(VAR))))