Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e5ff84f authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham@ideasonboard.com>
parent 01d509a4

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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

scripts/gdb/linux/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -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)