diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2016-12-04 15:42:55 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-12-05 14:11:50 -0500 |
| commit | 0b4d4b076251542dc81d128f481c3d3b5fc24863 (patch) | |
| tree | 36a6ea13781be407e4894edf42f6405c6d9f8946 /tools/perf | |
| parent | 5c319a67b13da8323ec7bdb8d2ea729eb8a20735 (diff) | |
perf tools: Move python/perf.so target into rules area
Following fixdep fix needs all targets at the same area, so they'll fit
under signal condition block.
Moving python/perf.so target into rules section and intentionally
removing the perl script related comment.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1480884178-8072-5-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Makefile.perf | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 593d765d62ab..2784b5843aef 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
| @@ -268,17 +268,6 @@ python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT | |||
| 268 | PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) | 268 | PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) |
| 269 | PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI) | 269 | PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI) |
| 270 | 270 | ||
| 271 | $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) | ||
| 272 | $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \ | ||
| 273 | CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \ | ||
| 274 | $(PYTHON_WORD) util/setup.py \ | ||
| 275 | --quiet build_ext; \ | ||
| 276 | mkdir -p $(OUTPUT)python && \ | ||
| 277 | cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/ | ||
| 278 | # | ||
| 279 | # No Perl scripts right now: | ||
| 280 | # | ||
| 281 | |||
| 282 | SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) | 271 | SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) |
| 283 | 272 | ||
| 284 | PROGRAMS += $(OUTPUT)perf | 273 | PROGRAMS += $(OUTPUT)perf |
| @@ -362,6 +351,14 @@ SHELL = $(SHELL_PATH) | |||
| 362 | 351 | ||
| 363 | all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) | 352 | all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) |
| 364 | 353 | ||
| 354 | $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) | ||
| 355 | $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \ | ||
| 356 | CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \ | ||
| 357 | $(PYTHON_WORD) util/setup.py \ | ||
| 358 | --quiet build_ext; \ | ||
| 359 | mkdir -p $(OUTPUT)python && \ | ||
| 360 | cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/ | ||
| 361 | |||
| 365 | please_set_SHELL_PATH_to_a_more_modern_shell: | 362 | please_set_SHELL_PATH_to_a_more_modern_shell: |
| 366 | $(Q)$$(:) | 363 | $(Q)$$(:) |
| 367 | 364 | ||
