aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2004-11-03 23:40:43 +0100
committerSam Ravnborg <sam@mars.ravnborg.org>2004-11-03 23:40:43 +0100
commitecfddb4651553fb68e00a80e860364b441571d98 (patch)
tree291985795e6eba4ec846face0113758bb5f59146 /scripts
parent7ee89d7940793d3c9431ad6549144f986b8fdcd0 (diff)
downloadhistory-ecfddb4651553fb68e00a80e860364b441571d98.tar.gz
kbuild: Prefer Kbuild as name of the kbuild files
The kbuild syntax is unique and does only have very few things in common with usual Makefile syntax. So to avoid confusion make the filename 'Kbuild' be the preferred name as replacement for 'Makefile'. No global renaming planned to take place for now, but new stuff expected to use the new 'Kbuild' filename. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.build2
-rw-r--r--scripts/Makefile.clean2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 672b0082e21f9f..352d531ee3c1e0 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -10,7 +10,7 @@ __build:
# Read .config if it exist, otherwise ignore
-include .config
-include $(obj)/Makefile
+include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
include scripts/Makefile.lib
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index b02ab1fb28e38d..ff3e87dbf38741 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -7,7 +7,7 @@ src := $(obj)
.PHONY: __clean
__clean:
-include $(obj)/Makefile
+include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
# Figure out what we need to build from the various variables
# ==========================================================================