aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2013-12-19 08:42:03 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-12-19 14:18:10 -0500
commitbdebbacd421184234b5551c468e53956a9b6edf5 (patch)
treeb8b35a61db3a6964d01905186b57c7d787227672 /tools/lib
parentc3d090f498a4d7a8905c92dbf83ae2aa4810fbef (diff)
tools lib traceevent: Add global QUIET_CC_FPIC build output
Adding global QUIET_CC_FPIC build output variable and getting rid of local print_fpic_compile and print_plugin_obj_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-6-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/Makefile16
1 files changed, 2 insertions, 14 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index e852a8d54d84..24203cc14649 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -152,33 +152,21 @@ override CFLAGS += $(udis86-flags) -D_GNU_SOURCE
152 152
153ifeq ($(VERBOSE),1) 153ifeq ($(VERBOSE),1)
154 Q = 154 Q =
155 print_fpic_compile =
156 print_shared_lib_compile = 155 print_shared_lib_compile =
157 print_plugin_obj_compile =
158 print_plugin_build = 156 print_plugin_build =
159 print_install = 157 print_install =
160else 158else
161 Q = @ 159 Q = @
162 print_fpic_compile = echo ' CC FPIC '$(OBJ);
163 print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ); 160 print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ);
164 print_plugin_obj_compile = echo ' CC FPIC '$(OBJ);
165 print_plugin_build = echo ' BUILD PLUGIN '$(OBJ); 161 print_plugin_build = echo ' BUILD PLUGIN '$(OBJ);
166 print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ); 162 print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ);
167 print_install = echo ' INSTALL '$1; 163 print_install = echo ' INSTALL '$1;
168endif 164endif
169 165
170do_fpic_compile = \
171 ($(print_fpic_compile) \
172 $(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@)
173
174do_compile_shared_library = \ 166do_compile_shared_library = \
175 ($(print_shared_lib_compile) \ 167 ($(print_shared_lib_compile) \
176 $(CC) --shared $^ -o $@) 168 $(CC) --shared $^ -o $@)
177 169
178do_compile_plugin_obj = \
179 ($(print_plugin_obj_compile) \
180 $(CC) -c $(CFLAGS) -fPIC -o $@ $<)
181
182do_plugin_build = \ 170do_plugin_build = \
183 ($(print_plugin_build) \ 171 ($(print_plugin_build) \
184 $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<) 172 $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
@@ -236,10 +224,10 @@ libtraceevent.a: $(PEVENT_LIB_OBJS)
236plugins: $(PLUGINS) 224plugins: $(PLUGINS)
237 225
238$(PEVENT_LIB_OBJS): %.o: $(src)/%.c TRACEEVENT-CFLAGS 226$(PEVENT_LIB_OBJS): %.o: $(src)/%.c TRACEEVENT-CFLAGS
239 $(Q)$(do_fpic_compile) 227 $(QUIET_CC_FPIC)$(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@
240 228
241$(PLUGIN_OBJS): %.o : $(src)/%.c 229$(PLUGIN_OBJS): %.o : $(src)/%.c
242 $(Q)$(do_compile_plugin_obj) 230 $(QUIET_CC_FPIC)$(CC) -c $(CFLAGS) -fPIC -o $@ $<
243 231
244$(PLUGINS): %.so: %.o 232$(PLUGINS): %.so: %.o
245 $(Q)$(do_plugin_build) 233 $(Q)$(do_plugin_build)