aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/Makefile.perf16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index c2ccc54618d1..93de7c7b8007 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -346,7 +346,7 @@ export PERL_PATH
346 346
347LIB_FILE=$(OUTPUT)libperf.a 347LIB_FILE=$(OUTPUT)libperf.a
348 348
349PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) 349PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD)
350ifndef NO_LIBBPF 350ifndef NO_LIBBPF
351 PERFLIBS += $(LIBBPF) 351 PERFLIBS += $(LIBBPF)
352endif 352endif
@@ -549,6 +549,8 @@ JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o
549 549
550PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o 550PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o
551 551
552LIBPERF_IN := $(OUTPUT)libperf-in.o
553
552export JEVENTS 554export JEVENTS
553 555
554build := -f $(srctree)/tools/build/Makefile.build dir=. obj 556build := -f $(srctree)/tools/build/Makefile.build dir=. obj
@@ -565,9 +567,12 @@ $(JEVENTS): $(JEVENTS_IN)
565$(PMU_EVENTS_IN): $(JEVENTS) FORCE 567$(PMU_EVENTS_IN): $(JEVENTS) FORCE
566 $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events 568 $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events
567 569
568$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(LIBTRACEEVENT_DYNAMIC_LIST) 570$(LIBPERF_IN): prepare FORCE
571 $(Q)$(MAKE) $(build)=libperf
572
573$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(LIBPERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)
569 $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS) \ 574 $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS) \
570 $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@ 575 $(PERF_IN) $(PMU_EVENTS_IN) $(LIBPERF_IN) $(LIBS) -o $@
571 576
572$(GTK_IN): FORCE 577$(GTK_IN): FORCE
573 $(Q)$(MAKE) $(build)=gtk 578 $(Q)$(MAKE) $(build)=gtk
@@ -683,11 +688,6 @@ endif
683 688
684$(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h) 689$(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h)
685 690
686LIBPERF_IN := $(OUTPUT)libperf-in.o
687
688$(LIBPERF_IN): prepare FORCE
689 $(Q)$(MAKE) $(build)=libperf
690
691$(LIB_FILE): $(LIBPERF_IN) 691$(LIB_FILE): $(LIBPERF_IN)
692 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS) 692 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS)
693 693