Skip to content

Commit 536e2b0

Browse files
Namhyung Kimacmel
authored andcommitted
perf tools: Cleanup doc related targets
Documentation targets handling rules are duplicate. Consolidate them with DOC_TARGETS and INSTALL_DOC_TARGETS. Signed-off-by: Namhyung Kim <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent b6f4f80 commit 536e2b0

File tree

1 file changed

+9
-37
lines changed

1 file changed

+9
-37
lines changed

tools/perf/Makefile

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -977,20 +977,15 @@ help:
977977
@echo 'Perf maintainer targets:'
978978
@echo ' clean - clean all binary objects and build output'
979979

980-
doc:
981-
$(MAKE) -C Documentation all
982980

983-
man:
984-
$(MAKE) -C Documentation man
981+
DOC_TARGETS := doc man html info pdf
985982

986-
html:
987-
$(MAKE) -C Documentation html
983+
INSTALL_DOC_TARGETS := $(patsubst %,install-%,$(DOC_TARGETS)) try-install-man
984+
INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html
988985

989-
info:
990-
$(MAKE) -C Documentation info
991-
992-
pdf:
993-
$(MAKE) -C Documentation pdf
986+
# 'make doc' should call 'make -C Documentation all'
987+
$(DOC_TARGETS):
988+
$(MAKE) -C Documentation $(@:doc=all)
994989

995990
TAGS:
996991
$(RM) TAGS
@@ -1061,32 +1056,9 @@ install: all try-install-man
10611056
install-python_ext:
10621057
$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
10631058

1064-
install-doc:
1065-
$(MAKE) -C Documentation install
1066-
1067-
install-man:
1068-
$(MAKE) -C Documentation install-man
1069-
1070-
try-install-man:
1071-
$(MAKE) -C Documentation try-install-man
1072-
1073-
install-html:
1074-
$(MAKE) -C Documentation install-html
1075-
1076-
install-info:
1077-
$(MAKE) -C Documentation install-info
1078-
1079-
install-pdf:
1080-
$(MAKE) -C Documentation install-pdf
1081-
1082-
quick-install-doc:
1083-
$(MAKE) -C Documentation quick-install
1084-
1085-
quick-install-man:
1086-
$(MAKE) -C Documentation quick-install-man
1087-
1088-
quick-install-html:
1089-
$(MAKE) -C Documentation quick-install-html
1059+
# 'make install-doc' should call 'make -C Documentation install'
1060+
$(INSTALL_DOC_TARGETS):
1061+
$(MAKE) -C Documentation $(@:-doc=)
10901062

10911063
### Cleaning rules
10921064

0 commit comments

Comments
 (0)