Skip to content

Commit bffd202

Browse files
pefoley2michal42
authored andcommitted
kbuild: move scripts/basic/docproc.c to scripts/docproc.c
Move docproc from scripts/basic to scripts so it is only built for *doc targets instead of every time the kernel is built.
1 parent 7a04fc9 commit bffd202

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

Documentation/DocBook/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ installmandocs: mandocs
7373
###
7474
#External programs used
7575
KERNELDOC = $(srctree)/scripts/kernel-doc
76-
DOCPROC = $(objtree)/scripts/basic/docproc
76+
DOCPROC = $(objtree)/scripts/docproc
7777

7878
XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl
7979
XMLTOFLAGS += --skip-validation

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,7 @@ $(help-board-dirs): help-%:
13131313
# Documentation targets
13141314
# ---------------------------------------------------------------------------
13151315
%docs: scripts_basic FORCE
1316+
$(Q)$(MAKE) $(build)=scripts build_docproc
13161317
$(Q)$(MAKE) $(build)=Documentation/DocBook $@
13171318

13181319
else # KBUILD_EXTMOD

scripts/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ bin2c
88
unifdef
99
ihex2fw
1010
recordmcount
11+
docproc

scripts/Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# pnmttologo: Convert pnm files to logo files
77
# conmakehash: Create chartable
88
# conmakehash: Create arrays for initializing the kernel console tables
9+
# docproc: Used in Documentation/DocBook
910

1011
hostprogs-$(CONFIG_KALLSYMS) += kallsyms
1112
hostprogs-$(CONFIG_LOGO) += pnmtologo
@@ -16,12 +17,14 @@ hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
1617
always := $(hostprogs-y) $(hostprogs-m)
1718

1819
# The following hostprogs-y programs are only build on demand
19-
hostprogs-y += unifdef
20+
hostprogs-y += unifdef docproc
2021

21-
# This target is used internally to avoid "is up to date" messages
22+
# These targets are used internally to avoid "is up to date" messages
2223
PHONY += build_unifdef
2324
build_unifdef: scripts/unifdef FORCE
2425
@:
26+
build_docproc: scripts/docproc FORCE
27+
@:
2528

2629
subdir-$(CONFIG_MODVERSIONS) += genksyms
2730
subdir-y += mod

scripts/basic/.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
hash
21
fixdep
3-
docproc

scripts/basic/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
# .config is included by main Makefile.
88
# ---------------------------------------------------------------------------
99
# fixdep: Used to generate dependency information during build process
10-
# docproc: Used in Documentation/DocBook
1110

12-
hostprogs-y := fixdep docproc
11+
hostprogs-y := fixdep
1312
always := $(hostprogs-y)
1413

1514
# fixdep is needed to compile other host programs
File renamed without changes.

0 commit comments

Comments
 (0)