diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2013-03-17 19:56:01 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-29 07:59:54 -0400 |
| commit | cd1c39f2c43701340ac287df5f306833533c8a7e (patch) | |
| tree | 6fa49710918a9151f71acb366257b35aa05a9245 /tools/perf/Makefile | |
| parent | 58a0abd7375fb41223a96f632f1450ec04ce6ff9 (diff) | |
perf tools: Move paths config into config/Makefile
Moving paths config into config/Makefile.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-17-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile')
| -rw-r--r-- | tools/perf/Makefile | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 11525ac18bde..240bf8861d7b 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -99,39 +99,6 @@ ifeq ($(config),1) | |||
| 99 | include config/Makefile | 99 | include config/Makefile |
| 100 | endif | 100 | endif |
| 101 | 101 | ||
| 102 | # Among the variables below, these: | ||
| 103 | # perfexecdir | ||
| 104 | # template_dir | ||
| 105 | # mandir | ||
| 106 | # infodir | ||
| 107 | # htmldir | ||
| 108 | # ETC_PERFCONFIG (but not sysconfdir) | ||
| 109 | # can be specified as a relative path some/where/else; | ||
| 110 | # this is interpreted as relative to $(prefix) and "perf" at | ||
| 111 | # runtime figures out where they are based on the path to the executable. | ||
| 112 | # This can help installing the suite in a relocatable way. | ||
| 113 | |||
| 114 | # Make the path relative to DESTDIR, not to prefix | ||
| 115 | ifndef DESTDIR | ||
| 116 | prefix = $(HOME) | ||
| 117 | endif | ||
| 118 | bindir_relative = bin | ||
| 119 | bindir = $(prefix)/$(bindir_relative) | ||
| 120 | mandir = share/man | ||
| 121 | infodir = share/info | ||
| 122 | perfexecdir = libexec/perf-core | ||
| 123 | sharedir = $(prefix)/share | ||
| 124 | template_dir = share/perf-core/templates | ||
| 125 | htmldir = share/doc/perf-doc | ||
| 126 | ifeq ($(prefix),/usr) | ||
| 127 | sysconfdir = /etc | ||
| 128 | ETC_PERFCONFIG = $(sysconfdir)/perfconfig | ||
| 129 | else | ||
| 130 | sysconfdir = $(prefix)/etc | ||
| 131 | ETC_PERFCONFIG = etc/perfconfig | ||
| 132 | endif | ||
| 133 | lib = lib | ||
| 134 | |||
| 135 | export prefix bindir sharedir sysconfdir | 102 | export prefix bindir sharedir sysconfdir |
| 136 | 103 | ||
| 137 | # sparse is architecture-neutral, which means that we need to tell it | 104 | # sparse is architecture-neutral, which means that we need to tell it |
| @@ -555,23 +522,6 @@ endif | |||
| 555 | endif # MAKECMDGOALS != tags | 522 | endif # MAKECMDGOALS != tags |
| 556 | endif # MAKECMDGOALS != clean | 523 | endif # MAKECMDGOALS != clean |
| 557 | 524 | ||
| 558 | # Shell quote (do not use $(call) to accommodate ancient setups); | ||
| 559 | |||
| 560 | ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG)) | ||
| 561 | |||
| 562 | DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) | ||
| 563 | bindir_SQ = $(subst ','\'',$(bindir)) | ||
| 564 | bindir_relative_SQ = $(subst ','\'',$(bindir_relative)) | ||
| 565 | mandir_SQ = $(subst ','\'',$(mandir)) | ||
| 566 | infodir_SQ = $(subst ','\'',$(infodir)) | ||
| 567 | perfexecdir_SQ = $(subst ','\'',$(perfexecdir)) | ||
| 568 | template_dir_SQ = $(subst ','\'',$(template_dir)) | ||
| 569 | htmldir_SQ = $(subst ','\'',$(htmldir)) | ||
| 570 | prefix_SQ = $(subst ','\'',$(prefix)) | ||
| 571 | sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) | ||
| 572 | |||
| 573 | SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) | ||
| 574 | |||
| 575 | LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group | 525 | LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group |
| 576 | 526 | ||
| 577 | ALL_CFLAGS += $(BASIC_CFLAGS) | 527 | ALL_CFLAGS += $(BASIC_CFLAGS) |
| @@ -580,7 +530,6 @@ ALL_LDFLAGS += $(BASIC_LDFLAGS) | |||
| 580 | 530 | ||
| 581 | export INSTALL SHELL_PATH | 531 | export INSTALL SHELL_PATH |
| 582 | 532 | ||
| 583 | |||
| 584 | ### Build rules | 533 | ### Build rules |
| 585 | 534 | ||
| 586 | SHELL = $(SHELL_PATH) | 535 | SHELL = $(SHELL_PATH) |
| @@ -822,13 +771,6 @@ check: $(OUTPUT)common-cmds.h | |||
| 822 | 771 | ||
| 823 | ### Installation rules | 772 | ### Installation rules |
| 824 | 773 | ||
| 825 | ifneq ($(filter /%,$(firstword $(perfexecdir))),) | ||
| 826 | perfexec_instdir = $(perfexecdir) | ||
| 827 | else | ||
| 828 | perfexec_instdir = $(prefix)/$(perfexecdir) | ||
| 829 | endif | ||
| 830 | perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir)) | ||
| 831 | |||
| 832 | install-bin: all | 774 | install-bin: all |
| 833 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' | 775 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' |
| 834 | $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' | 776 | $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' |
