summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-16 12:17:35 -0500
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-16 12:17:35 -0500
commit366b173e7136fe4ac6fd252fffec648a5cbf3181 (patch)
tree21a796937650f7a81d2738722b78e9c9a7d92c96
parent6d65aab5bb3bbc05f280b4a49268982dfa76c2e1 (diff)
kbuild: another "make clean" micro-optimization
Patch by Peter Samuelson, merged to current code, actually has a noticable impact on "make clean" speed.
-rw-r--r--Rules.make19
-rw-r--r--scripts/Makefile.clean2
2 files changed, 8 insertions, 13 deletions
diff --git a/Rules.make b/Rules.make
index 577f2c9ee83a..9343c984a820 100644
--- a/Rules.make
+++ b/Rules.make
@@ -166,7 +166,7 @@ ifneq ($(strip $(__clean-files) $(clean-rule)),)
rm -f $(__clean-files)
$(clean-rule)
else
- @/bin/true
+ @:
endif
else
@@ -182,7 +182,7 @@ ifeq ($(strip $(export-objs)),)
# ---------------------------------------------------------------------------
fastdep: $(subdir-ym)
- @/bin/true
+ @:
else
@@ -274,7 +274,7 @@ modules_install: $(subdir-ym)
ifneq ($(obj-m),)
$(call cmd,modules_install)
else
- @/bin/true
+ @:
endif
else # ! modules_install
@@ -283,23 +283,18 @@ else # ! modules_install
# Building
# ==========================================================================
-# If a Makefile does define neither O_TARGET nor L_TARGET,
-# use a standard O_TARGET named "built-in.o"
-
-ifndef O_TARGET
-ifndef L_TARGET
-O_TARGET := $(obj)/built-in.o
-endif
-endif
+# If a Makefile does not define a L_TARGET, link an object called "built-in.o"
ifdef L_TARGET
L_TARGET := $(obj)/$(L_TARGET)
+else
+O_TARGET := $(obj)/built-in.o
endif
first_rule: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
$(if $(KBUILD_MODULES),$(obj-m)) \
$(subdir-ym)
- @/bin/true
+ @:
# Compile C sources (.c)
# ---------------------------------------------------------------------------
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index fa809a7e88ad..d7bb2dfb88d8 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -32,7 +32,7 @@ ifneq ($(strip $(__clean-files) $(clean-rule)),)
rm -f $(__clean-files)
$(clean-rule)
else
- @/bin/true
+ @:
endif
.PHONY: $(subdir-ymn)