aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2013-12-19 08:42:05 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-12-19 14:18:11 -0500
commit02a82c7bcd353b8cc4d4f8b3c872b527fbac7c31 (patch)
tree9df8e159f9520efaf3daa0d705219f5bef24ec35 /tools
parente6262e23134f575ae07ecc25bb69ddb63caebc95 (diff)
tools lib traceevent: Use global QUIET_INSTALL build output
Using global QUIET_INSTALL build output variable and factoring plugins installation so we could have only single install message for plugins: INSTALL trace_plugins Getting rid of local print_install. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1387460527-15030-8-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/lib/traceevent/Makefile21
1 files changed, 11 insertions, 10 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 51be8ab76f9f..8ea4368381f0 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -152,10 +152,8 @@ override CFLAGS += $(udis86-flags) -D_GNU_SOURCE
152 152
153ifeq ($(VERBOSE),1) 153ifeq ($(VERBOSE),1)
154 Q = 154 Q =
155 print_install =
156else 155else
157 Q = @ 156 Q = @
158 print_install = echo ' INSTALL '$1;
159endif 157endif
160 158
161do_compile_shared_library = \ 159do_compile_shared_library = \
@@ -307,22 +305,25 @@ TAGS: force
307 --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/' 305 --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'
308 306
309define do_install 307define do_install
310 $(print_install) \
311 if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ 308 if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
312 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ 309 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
313 fi; \ 310 fi; \
314 $(INSTALL) $1 '$(DESTDIR_SQ)$2' 311 $(INSTALL) $1 '$(DESTDIR_SQ)$2'
315endef 312endef
316 313
317install_lib: all_cmd install_plugins 314define do_install_plugins
318 $(Q)$(call do_install,$(LIB_FILE),$(bindir_SQ)) 315 for plugin in $1; do \
319 316 $(call do_install,$$plugin,$(plugin_dir_SQ)); \
320PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS)) 317 done
318endef
321 319
322$(PLUGINS_INSTALL): %.install : %.so force 320install_lib: all_cmd install_plugins
323 $(Q)$(call do_install,$<,$(plugin_dir_SQ)) 321 $(call QUIET_INSTALL, $(LIB_FILE)) \
322 $(call do_install,$(LIB_FILE),$(bindir_SQ))
324 323
325install_plugins: $(PLUGINS_INSTALL) 324install_plugins: $(PLUGINS)
325 $(call QUIET_INSTALL, trace_plugins) \
326 $(call do_install_plugins, $(PLUGINS))
326 327
327install: install_lib 328install: install_lib
328 329