| From ee9eb1aa32c8779257ebca320443a33db6b8e6bd Mon Sep 17 00:00:00 2001 |
| From: "Nam T. Nguyen" <namnguyen@chromium.org> |
| Date: Mon, 18 May 2015 10:28:56 -0700 |
| Subject: [PATCH v2] perf: Separate the tests and tools in installation |
| |
| This refactors out install-bin to install-tests and install-tools so |
| that downstream could opt to only install the tools, and not the tests. |
| |
| Change-Id: Idfac38ca6fcb3057baeda416591473c9d86dffe9 |
| Signed-off-by: Nam T. Nguyen <namnguyen@chromium.org> |
| --- |
| Changes from v1: |
| |
| * Keep original target dependencies |
| |
| tools/perf/Makefile.perf | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf |
| index 7257e7e..2cb98db 100644 |
| --- a/tools/perf/Makefile.perf |
| +++ b/tools/perf/Makefile.perf |
| @@ -830,7 +830,7 @@ check: $(OUTPUT)common-cmds.h |
| |
| install-gtk: |
| |
| -install-bin: all install-gtk |
| +install-tools: all install-gtk |
| $(call QUIET_INSTALL, binaries) \ |
| $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \ |
| $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \ |
| @@ -858,12 +858,16 @@ endif |
| $(call QUIET_INSTALL, perf_completion-script) \ |
| $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \ |
| $(INSTALL) perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' |
| + |
| +install-tests: all install-gtk |
| $(call QUIET_INSTALL, tests) \ |
| $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ |
| $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ |
| $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ |
| $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' |
| |
| +install-bin: install-tools install-tests |
| + |
| install: install-bin try-install-man install-traceevent-plugins |
| |
| install-python_ext: |
| -- |
| 2.2.0.rc0.207.ga3a616c |
| |