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

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

libperf: Link libapi.a in libperf.so 



Linking libapi.a in libperf.so, because we are about to use some of the
API functions in it.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-10-jolsa@kernel.org


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

tools/perf/lib/Makefile

+30 −3
Original line number Diff line number Diff line
@@ -59,7 +59,13 @@ else 
  CFLAGS := -g -Wall

endif



INCLUDES = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/ -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi

INCLUDES = \

-I$(srctree)/tools/perf/lib/include \

-I$(srctree)/tools/lib/ \

-I$(srctree)/tools/include \

-I$(srctree)/tools/arch/$(SRCARCH)/include/ \

-I$(srctree)/tools/arch/$(SRCARCH)/include/uapi \

-I$(srctree)/tools/include/uapi



# Append required CFLAGS

override CFLAGS += $(EXTRA_WARNINGS)
@@ -88,13 +94,34 @@ LIBPERF_PC := $(OUTPUT)libperf.pc 


LIBPERF_ALL := $(LIBPERF_A) $(OUTPUT)libperf.so*



LIB_DIR := $(srctree)/tools/lib/api/



ifneq ($(OUTPUT),)

ifneq ($(subdir),)

  API_PATH=$(OUTPUT)/../lib/api/

else

  API_PATH=$(OUTPUT)

endif

else

  API_PATH=$(LIB_DIR)

endif



LIBAPI = $(API_PATH)libapi.a



$(LIBAPI): FORCE

	$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a



$(LIBAPI)-clean:

	$(call QUIET_CLEAN, libapi)

	$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null



$(LIBPERF_IN): FORCE

	$(Q)$(MAKE) $(build)=libperf



$(LIBPERF_A): $(LIBPERF_IN)

	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN)



$(LIBPERF_SO): $(LIBPERF_IN)

$(LIBPERF_SO): $(LIBPERF_IN) $(LIBAPI)

	$(QUIET_LINK)$(CC) --shared -Wl,-soname,libperf.so \

                                    -Wl,--version-script=$(VERSION_SCRIPT) $^ -o $@

	@ln -sf $(@F) $(OUTPUT)libperf.so
@@ -106,7 +133,7 @@ libs: $(LIBPERF_A) $(LIBPERF_SO) $(LIBPERF_PC) 
all: fixdep

	$(Q)$(MAKE) libs



clean:

clean: $(LIBAPI)-clean

	$(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \

                *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd LIBPERF-CFLAGS $(LIBPERF_PC)

	$(Q)$(MAKE) -C tests clean