diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-12-06 11:35:06 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-01-08 17:41:00 +0900 |
| commit | 50a483405c420f5f35b8dbb71425459835ae44eb (patch) | |
| tree | 0e85f0174470018a6343aaf95d9877681adf6511 | |
| parent | e06a61a89ccd3edda046c78f9d08aa045b8c4d32 (diff) | |
| download | lwn-50a483405c420f5f35b8dbb71425459835ae44eb.tar.gz lwn-50a483405c420f5f35b8dbb71425459835ae44eb.zip | |
kbuild: move headers_check.pl to usr/include/
This script is only used by usr/include/Makefile. Make it local to
the directory.
Update the comment in include/uapi/linux/soundcard.h because
'make headers_check' is no longer functional.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| -rw-r--r-- | include/uapi/linux/soundcard.h | 2 | ||||
| -rw-r--r-- | usr/include/Makefile | 6 | ||||
| -rwxr-xr-x | usr/include/headers_check.pl (renamed from scripts/headers_check.pl) | 0 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/uapi/linux/soundcard.h b/include/uapi/linux/soundcard.h index f3b21f989872..ac1318793a86 100644 --- a/include/uapi/linux/soundcard.h +++ b/include/uapi/linux/soundcard.h @@ -1051,7 +1051,7 @@ typedef struct mixer_vol_table { * the GPL version of OSS-4.x and build against that version * of the header. * - * We redefine the extern keyword so that make headers_check + * We redefine the extern keyword so that usr/include/headers_check.pl * does not complain about SEQ_USE_EXTBUF. */ #define SEQ_DECLAREBUF() SEQ_USE_EXTBUF() diff --git a/usr/include/Makefile b/usr/include/Makefile index 1c2ae1368079..94403806ea56 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -99,10 +99,12 @@ quiet_cmd_hdrtest = HDRTEST $< cmd_hdrtest = \ $(CC) $(c_flags) -S -o /dev/null -x c /dev/null \ $(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \ - $(PERL) $(srctree)/scripts/headers_check.pl $(obj) $(SRCARCH) $<; \ + $(PERL) $(srctree)/$(src)/headers_check.pl $(obj) $(SRCARCH) $<; \ touch $@ $(obj)/%.hdrtest: $(obj)/%.h FORCE $(call if_changed_dep,hdrtest) -clean-files += $(filter-out Makefile, $(notdir $(wildcard $(obj)/*))) +# Since GNU Make 4.3, $(patsubst $(obj)/%/,%,$(wildcard $(obj)/*/)) works. +# To support older Make versions, use a somewhat tedious way. +clean-files += $(filter-out Makefile headers_check.pl, $(notdir $(wildcard $(obj)/*))) diff --git a/scripts/headers_check.pl b/usr/include/headers_check.pl index b6aec5e4365f..b6aec5e4365f 100755 --- a/scripts/headers_check.pl +++ b/usr/include/headers_check.pl |