summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-02-19 18:33:04 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-02-27 21:40:09 +0900
commit1e5ff84ffe0b09f866761c441003c27ca7e1c6b3 (patch)
tree11b4db4549af9078b96adc6376aa4eb9fa10729c
parent01d509a48b467fa6e03d4af43b84bce835af4cef (diff)
scripts/gdb: do not descend into scripts/gdb from scripts
Currently, Kbuild descends from scripts/Makefile to scripts/gdb/Makefile just for creating symbolic links, but it does not need to do it so early. Merge the two descending paths to simplify the code. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--Makefile2
-rw-r--r--scripts/Makefile3
-rw-r--r--scripts/gdb/linux/Makefile9
3 files changed, 5 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 15a9987a200d..d05da1b9982b 100644
--- a/Makefile
+++ b/Makefile
@@ -1524,7 +1524,7 @@ $(DOC_TARGETS): scripts_basic FORCE
PHONY += scripts_gdb
scripts_gdb: prepare
- $(Q)$(MAKE) $(build)=scripts/gdb/linux build_constants_py
+ $(Q)$(MAKE) $(build)=scripts/gdb
ifdef CONFIG_GDB_SCRIPTS
all: scripts_gdb
diff --git a/scripts/Makefile b/scripts/Makefile
index feb1f71381d7..9d442ee050bd 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef
subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
-subdir-$(CONFIG_GDB_SCRIPTS) += gdb
# Let clean descend into subdirs
-subdir- += basic dtc kconfig mod package
+subdir- += basic dtc gdb kconfig mod package
diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile
index aba23be985e4..754580609360 100644
--- a/scripts/gdb/linux/Makefile
+++ b/scripts/gdb/linux/Makefile
@@ -14,11 +14,8 @@ quiet_cmd_gen_constants_py = GEN $@
$(CPP) -E -x c -P $(c_flags) $< > $@ ;\
sed -i '1,/<!-- end-c-headers -->/d;' $@
-targets += constants.py
-$(obj)/constants.py: $(SRCTREE)/$(obj)/constants.py.in FORCE
+extra-y += constants.py
+$(obj)/constants.py: $(src)/constants.py.in FORCE
$(call if_changed_dep,gen_constants_py)
-build_constants_py: $(obj)/constants.py
- @:
-
-clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) $(obj)/constants.py
+clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py)