Commit ef8ff89b authored by Michal Marek's avatar Michal Marek
Browse files

kbuild: Really don't clean bounds.h and asm-offsets.h



Commit 7d3cc8b6 tried to keep bounds.h and asm-offsets.h during make
clean by filtering these out of $(clean-files), but they are listed in
$(targets) and $(always) and thus removed automatically. Introduce a new
$(no-clean-files) variable to really skip such files in Makefile.clean.

Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 2d74b2c6
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -779,6 +779,13 @@ This will delete the directory debian, including all subdirectories.
Kbuild will assume the directories to be in the same relative path as the
Kbuild will assume the directories to be in the same relative path as the
Makefile if no absolute path is specified (path does not start with '/').
Makefile if no absolute path is specified (path does not start with '/').


To exclude certain files from make clean, use the $(no-clean-files) variable.
This is only a special case used in the top level Kbuild file:

	Example:
		#Kbuild
		no-clean-files := $(bounds-file) $(offsets-file)

Usually kbuild descends down in subdirectories due to "obj-* := dir/",
Usually kbuild descends down in subdirectories due to "obj-* := dir/",
but in the architecture makefiles where the kbuild infrastructure
but in the architecture makefiles where the kbuild infrastructure
is not sufficient this sometimes needs to be explicit.
is not sufficient this sometimes needs to be explicit.
+2 −2
Original line number Original line Diff line number Diff line
@@ -94,5 +94,5 @@ PHONY += missing-syscalls
missing-syscalls: scripts/checksyscalls.sh FORCE
missing-syscalls: scripts/checksyscalls.sh FORCE
	$(call cmd,syscalls)
	$(call cmd,syscalls)


# Delete all targets during make clean
# Keep these two files during make clean
clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))
no-clean-files := $(bounds-file) $(offsets-file)
+2 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,8 @@ __clean-files := $(extra-y) $(always) \
		   $(host-progs)                         \
		   $(host-progs)                         \
		   $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
		   $(hostprogs-y) $(hostprogs-m) $(hostprogs-)


__clean-files   := $(filter-out $(no-clean-files), $(__clean-files))

# as clean-files is given relative to the current directory, this adds
# as clean-files is given relative to the current directory, this adds
# a $(obj) prefix, except for absolute paths
# a $(obj) prefix, except for absolute paths