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
 
 ifeq ($(VERBOSE),1)
   Q =
-  print_shared_lib_compile =
-  print_plugin_build =
   print_install =
 else
   Q = @
-  print_shared_lib_compile =    echo '  BUILD    SHARED LIB '$(OBJ);
-  print_plugin_build =          echo '  BUILD    PLUGIN '$(OBJ);
-  print_static_lib_build =      echo '  BUILD    STATIC LIB '$(OBJ);
   print_install =               echo '  INSTALL  '$1;
 endif
 
@@ -216,10 +211,10 @@ all: all_cmd
 all_cmd: $(CMD_TARGETS)
 
 libtraceevent.so: $(PEVENT_LIB_OBJS)
-        $(Q)$(do_compile_shared_library)
+        $(QUIET_LINK)$(CC) --shared $^ -o $@
 
 libtraceevent.a: $(PEVENT_LIB_OBJS)
-        $(Q)$(do_build_static_lib)
+        $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
 
 plugins: $(PLUGINS)
 
@@ -230,7 +225,7 @@ $(PLUGIN_OBJS): %.o : $(src)/%.c
         $(QUIET_CC_FPIC)$(CC) -c $(CFLAGS) -fPIC -o $@ $<
 
 $(PLUGINS): %.so: %.o
-        $(Q)$(do_plugin_build)
+        $(QUIET_LINK)$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<
 
 define make_version.h
         (echo '/* This file is automatically generated. Do not modify. */';             \