Skip to content

Commit 50a4834

Browse files
committed
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 <[email protected]>
1 parent e06a61a commit 50a4834

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

include/uapi/linux/soundcard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ typedef struct mixer_vol_table {
10511051
* the GPL version of OSS-4.x and build against that version
10521052
* of the header.
10531053
*
1054-
* We redefine the extern keyword so that make headers_check
1054+
* We redefine the extern keyword so that usr/include/headers_check.pl
10551055
* does not complain about SEQ_USE_EXTBUF.
10561056
*/
10571057
#define SEQ_DECLAREBUF() SEQ_USE_EXTBUF()

usr/include/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,12 @@ quiet_cmd_hdrtest = HDRTEST $<
9999
cmd_hdrtest = \
100100
$(CC) $(c_flags) -S -o /dev/null -x c /dev/null \
101101
$(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \
102-
$(PERL) $(srctree)/scripts/headers_check.pl $(obj) $(SRCARCH) $<; \
102+
$(PERL) $(srctree)/$(src)/headers_check.pl $(obj) $(SRCARCH) $<; \
103103
touch $@
104104

105105
$(obj)/%.hdrtest: $(obj)/%.h FORCE
106106
$(call if_changed_dep,hdrtest)
107107

108-
clean-files += $(filter-out Makefile, $(notdir $(wildcard $(obj)/*)))
108+
# Since GNU Make 4.3, $(patsubst $(obj)/%/,%,$(wildcard $(obj)/*/)) works.
109+
# To support older Make versions, use a somewhat tedious way.
110+
clean-files += $(filter-out Makefile headers_check.pl, $(notdir $(wildcard $(obj)/*)))
File renamed without changes.

0 commit comments

Comments
 (0)