Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6262e23 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: 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-7-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bdebbacd

tools/lib/traceevent/Makefile

+3 −8
Original line number Diff line number Diff line
@@ -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. */';		\