Commit 02a82c7b authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

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: default avatarJiri 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.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e6262e23
...@@ -152,10 +152,8 @@ override CFLAGS += $(udis86-flags) -D_GNU_SOURCE ...@@ -152,10 +152,8 @@ override CFLAGS += $(udis86-flags) -D_GNU_SOURCE
ifeq ($(VERBOSE),1) ifeq ($(VERBOSE),1)
Q = Q =
print_install =
else else
Q = @ Q = @
print_install = echo ' INSTALL '$1;
endif endif
do_compile_shared_library = \ do_compile_shared_library = \
...@@ -307,22 +305,25 @@ TAGS: force ...@@ -307,22 +305,25 @@ TAGS: force
--regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/' --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'
define do_install define do_install
$(print_install) \
if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
fi; \ fi; \
$(INSTALL) $1 '$(DESTDIR_SQ)$2' $(INSTALL) $1 '$(DESTDIR_SQ)$2'
endef endef
install_lib: all_cmd install_plugins define do_install_plugins
$(Q)$(call do_install,$(LIB_FILE),$(bindir_SQ)) for plugin in $1; do \
$(call do_install,$$plugin,$(plugin_dir_SQ)); \
PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS)) done
endef
$(PLUGINS_INSTALL): %.install : %.so force install_lib: all_cmd install_plugins
$(Q)$(call do_install,$<,$(plugin_dir_SQ)) $(call QUIET_INSTALL, $(LIB_FILE)) \
$(call do_install,$(LIB_FILE),$(bindir_SQ))
install_plugins: $(PLUGINS_INSTALL) install_plugins: $(PLUGINS)
$(call QUIET_INSTALL, trace_plugins) \
$(call do_install_plugins, $(PLUGINS))
install: install_lib install: install_lib
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment