diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2013-12-19 08:42:04 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-12-19 14:18:10 -0500 |
| commit | e6262e23134f575ae07ecc25bb69ddb63caebc95 (patch) | |
| tree | 5966a8b65204fe171b88cd1052e5dce38e7eb954 /tools | |
| parent | bdebbacd421184234b5551c468e53956a9b6edf5 (diff) | |
tools lib traceevent: Use global QUIET_LINK build output
Using global QUIET_LINK build output variable and getting rid of local
print_static_lib_build, print_plugin_build and print_shared_lib_compile.
We no longer distinguish between shared and static library in the build
message. It's differenced by the built file suffix, like:
$ make
...
LINK libtraceevent.a
LINK libtraceevent.so
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-7-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/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 24203cc14649..51be8ab76f9f 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile | |||
| @@ -152,14 +152,9 @@ override CFLAGS += $(udis86-flags) -D_GNU_SOURCE | |||
| 152 | 152 | ||
| 153 | ifeq ($(VERBOSE),1) | 153 | ifeq ($(VERBOSE),1) |
| 154 | Q = | 154 | Q = |
| 155 | print_shared_lib_compile = | ||
| 156 | print_plugin_build = | ||
| 157 | print_install = | 155 | print_install = |
| 158 | else | 156 | else |
| 159 | Q = @ | 157 | Q = @ |
| 160 | print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ); | ||
| 161 | print_plugin_build = echo ' BUILD PLUGIN '$(OBJ); | ||
| 162 | print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ); | ||
| 163 | print_install = echo ' INSTALL '$1; | 158 | print_install = echo ' INSTALL '$1; |
| 164 | endif | 159 | endif |
| 165 | 160 | ||
| @@ -216,10 +211,10 @@ all: all_cmd | |||
| 216 | all_cmd: $(CMD_TARGETS) | 211 | all_cmd: $(CMD_TARGETS) |
| 217 | 212 | ||
| 218 | libtraceevent.so: $(PEVENT_LIB_OBJS) | 213 | libtraceevent.so: $(PEVENT_LIB_OBJS) |
| 219 | $(Q)$(do_compile_shared_library) | 214 | $(QUIET_LINK)$(CC) --shared $^ -o $@ |
| 220 | 215 | ||
| 221 | libtraceevent.a: $(PEVENT_LIB_OBJS) | 216 | libtraceevent.a: $(PEVENT_LIB_OBJS) |
| 222 | $(Q)$(do_build_static_lib) | 217 | $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^ |
| 223 | 218 | ||
| 224 | plugins: $(PLUGINS) | 219 | plugins: $(PLUGINS) |
| 225 | 220 | ||
| @@ -230,7 +225,7 @@ $(PLUGIN_OBJS): %.o : $(src)/%.c | |||
| 230 | $(QUIET_CC_FPIC)$(CC) -c $(CFLAGS) -fPIC -o $@ $< | 225 | $(QUIET_CC_FPIC)$(CC) -c $(CFLAGS) -fPIC -o $@ $< |
| 231 | 226 | ||
| 232 | $(PLUGINS): %.so: %.o | 227 | $(PLUGINS): %.so: %.o |
| 233 | $(Q)$(do_plugin_build) | 228 | $(QUIET_LINK)$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $< |
| 234 | 229 | ||
| 235 | define make_version.h | 230 | define make_version.h |
| 236 | (echo '/* This file is automatically generated. Do not modify. */'; \ | 231 | (echo '/* This file is automatically generated. Do not modify. */'; \ |
