forked from luck/tmp_suning_uos_patched
libperf: Move to tools/lib/perf
Move libperf from its current location under tools/perf to a separate directory under tools/lib/. Also change various paths (mainly includes) to reflect the libperf move to a separate directory and add a new directory under MANIFEST. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20191206210612.8676-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
6ae9c10b7c
commit
3ce311afb5
|
@ -60,7 +60,7 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
-I$(srctree)/tools/perf/lib/include \
|
-I$(srctree)/tools/lib/perf/include \
|
||||||
-I$(srctree)/tools/lib/ \
|
-I$(srctree)/tools/lib/ \
|
||||||
-I$(srctree)/tools/include \
|
-I$(srctree)/tools/include \
|
||||||
-I$(srctree)/tools/arch/$(SRCARCH)/include/ \
|
-I$(srctree)/tools/arch/$(SRCARCH)/include/ \
|
|
@ -16,7 +16,7 @@ all:
|
||||||
|
|
||||||
include $(srctree)/tools/scripts/Makefile.include
|
include $(srctree)/tools/scripts/Makefile.include
|
||||||
|
|
||||||
INCLUDE = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include -I$(srctree)/tools/lib
|
INCLUDE = -I$(srctree)/tools/lib/perf/include -I$(srctree)/tools/include -I$(srctree)/tools/lib
|
||||||
|
|
||||||
$(TESTS_A): FORCE
|
$(TESTS_A): FORCE
|
||||||
$(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -o $@ $(subst -a,.c,$@) ../libperf.a $(LIBAPI)
|
$(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -o $@ $(subst -a,.c,$@) ../libperf.a $(LIBAPI)
|
|
@ -7,6 +7,7 @@ tools/lib/traceevent
|
||||||
tools/lib/api
|
tools/lib/api
|
||||||
tools/lib/bpf
|
tools/lib/bpf
|
||||||
tools/lib/subcmd
|
tools/lib/subcmd
|
||||||
|
tools/lib/perf
|
||||||
tools/lib/argv_split.c
|
tools/lib/argv_split.c
|
||||||
tools/lib/ctype.c
|
tools/lib/ctype.c
|
||||||
tools/lib/hweight.c
|
tools/lib/hweight.c
|
||||||
|
|
|
@ -286,7 +286,7 @@ ifeq ($(DEBUG),0)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INC_FLAGS += -I$(src-perf)/lib/include
|
INC_FLAGS += -I$(srctree)/tools/lib/perf/include
|
||||||
INC_FLAGS += -I$(src-perf)/util/include
|
INC_FLAGS += -I$(src-perf)/util/include
|
||||||
INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include
|
INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include
|
||||||
INC_FLAGS += -I$(srctree)/tools/include/
|
INC_FLAGS += -I$(srctree)/tools/include/
|
||||||
|
|
|
@ -230,7 +230,7 @@ LIB_DIR = $(srctree)/tools/lib/api/
|
||||||
TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
|
TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
|
||||||
BPF_DIR = $(srctree)/tools/lib/bpf/
|
BPF_DIR = $(srctree)/tools/lib/bpf/
|
||||||
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
|
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
|
||||||
LIBPERF_DIR = $(srctree)/tools/perf/lib/
|
LIBPERF_DIR = $(srctree)/tools/lib/perf/
|
||||||
|
|
||||||
# Set FEATURE_TESTS to 'all' so all possible feature checkers are executed.
|
# Set FEATURE_TESTS to 'all' so all possible feature checkers are executed.
|
||||||
# Without this setting the output feature dump file misses some features, for
|
# Without this setting the output feature dump file misses some features, for
|
||||||
|
|
Loading…
Reference in New Issue
Block a user