Commit 7cd053d4 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Unify a bit the build directory output 



Removing the extra 'SUBDIR' line from clean and doc build output.
Because it's annoying.. ;-)

Before:

  $ make clean
  ...
  SUBDIR   Documentation
  CLEAN    Documentation

After:

  $ make clean
  ...
  CLEAN    Documentation

Before:

  $ make doc
  BUILD:   Doing 'make -j8' parallel build
  SUBDIR   Documentation
  ASCIIDOC perf-stat.html
  ...

After:

  $ make doc
  BUILD:   Doing 'make -j8' parallel build
  ASCIIDOC perf-stat.html
  ...

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200318204522.1200981-1-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 29f36c16

tools/perf/Makefile.perf

+5 −4
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/ 
BPF_DIR         = $(srctree)/tools/lib/bpf/

SUBCMD_DIR      = $(srctree)/tools/lib/subcmd/

LIBPERF_DIR     = $(srctree)/tools/lib/perf/

DOC_DIR         = $(srctree)/tools/perf/Documentation/



# Set FEATURE_TESTS to 'all' so all possible feature checkers are executed.

# Without this setting the output feature dump file misses some features, for
@@ -792,7 +793,6 @@ $(LIBSUBCMD): FORCE 
	$(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) $(OUTPUT)libsubcmd.a



$(LIBSUBCMD)-clean:

	$(call QUIET_CLEAN, libsubcmd)

	$(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) clean



help:
@@ -832,7 +832,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html 


# 'make doc' should call 'make -C Documentation all'

$(DOC_TARGETS):

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all)

	$(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all)



TAG_FOLDERS= . ../lib ../include

TAG_FILES= ../../include/uapi/linux/perf_event.h
@@ -959,7 +959,7 @@ install-python_ext: 


# 'make install-doc' should call 'make -C Documentation install'

$(INSTALL_DOC_TARGETS):

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=)

	$(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=)



### Cleaning rules
@@ -1008,7 +1008,8 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea 
		$(OUTPUT)$(rename_flags_array) \

		$(OUTPUT)$(arch_errno_name_array) \

		$(OUTPUT)$(sync_file_range_arrays)

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

	$(call QUIET_CLEAN, Documentation) \

	$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) clean >/dev/null



#

# To provide FEATURE-DUMP into $(FEATURE_DUMP_COPY)

CRA Git | Maintained and supported by SUSTech CRA and CCSE