diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-12-19 08:42:02 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-12-19 14:18:09 -0500 |
commit | c3d090f498a4d7a8905c92dbf83ae2aa4810fbef (patch) | |
tree | e6b04e97291681e4a2fe86542d76d043e6067628 /tools/lib | |
parent | db72a330587e10d6b8009e0dcf3d97aa9b1e2659 (diff) |
tools lib traceevent: Use global QUIET_CC build output
Using global QUIET_CC build output variable and getting rid of local
print_compile.
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-5-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/traceevent/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 022c987d25b6..e852a8d54d84 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile | |||
@@ -67,6 +67,8 @@ PLUGIN_DIR = -DPLUGIN_DIR="$(DESTDIR)/$(plugin_dir)" | |||
67 | PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' | 67 | PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' |
68 | endif | 68 | endif |
69 | 69 | ||
70 | include $(if $(BUILD_SRC),$(BUILD_SRC)/)../../scripts/Makefile.include | ||
71 | |||
70 | # copy a bit from Linux kbuild | 72 | # copy a bit from Linux kbuild |
71 | 73 | ||
72 | ifeq ("$(origin V)", "command line") | 74 | ifeq ("$(origin V)", "command line") |
@@ -150,7 +152,6 @@ override CFLAGS += $(udis86-flags) -D_GNU_SOURCE | |||
150 | 152 | ||
151 | ifeq ($(VERBOSE),1) | 153 | ifeq ($(VERBOSE),1) |
152 | Q = | 154 | Q = |
153 | print_compile = | ||
154 | print_fpic_compile = | 155 | print_fpic_compile = |
155 | print_shared_lib_compile = | 156 | print_shared_lib_compile = |
156 | print_plugin_obj_compile = | 157 | print_plugin_obj_compile = |
@@ -158,7 +159,6 @@ ifeq ($(VERBOSE),1) | |||
158 | print_install = | 159 | print_install = |
159 | else | 160 | else |
160 | Q = @ | 161 | Q = @ |
161 | print_compile = echo ' CC '$(OBJ); | ||
162 | print_fpic_compile = echo ' CC FPIC '$(OBJ); | 162 | print_fpic_compile = echo ' CC FPIC '$(OBJ); |
163 | print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ); | 163 | print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ); |
164 | print_plugin_obj_compile = echo ' CC FPIC '$(OBJ); | 164 | print_plugin_obj_compile = echo ' CC FPIC '$(OBJ); |
@@ -188,16 +188,13 @@ do_build_static_lib = \ | |||
188 | $(RM) $@; $(AR) rcs $@ $^) | 188 | $(RM) $@; $(AR) rcs $@ $^) |
189 | 189 | ||
190 | 190 | ||
191 | define do_compile | 191 | do_compile = $(QUIET_CC)$(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@; |
192 | $(print_compile) \ | ||
193 | $(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@; | ||
194 | endef | ||
195 | 192 | ||
196 | $(obj)/%.o: $(src)/%.c | 193 | $(obj)/%.o: $(src)/%.c |
197 | $(Q)$(call do_compile) | 194 | $(call do_compile) |
198 | 195 | ||
199 | %.o: $(src)/%.c | 196 | %.o: $(src)/%.c |
200 | $(Q)$(call do_compile) | 197 | $(call do_compile) |
201 | 198 | ||
202 | PEVENT_LIB_OBJS = event-parse.o | 199 | PEVENT_LIB_OBJS = event-parse.o |
203 | PEVENT_LIB_OBJS += event-plugin.o | 200 | PEVENT_LIB_OBJS += event-plugin.o |