mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 08:00:52 +07:00
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>
This commit is contained in:
parent
58a0abd737
commit
cd1c39f2c4
@ -99,39 +99,6 @@ ifeq ($(config),1)
|
|||||||
include config/Makefile
|
include config/Makefile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Among the variables below, these:
|
|
||||||
# perfexecdir
|
|
||||||
# template_dir
|
|
||||||
# mandir
|
|
||||||
# infodir
|
|
||||||
# htmldir
|
|
||||||
# ETC_PERFCONFIG (but not sysconfdir)
|
|
||||||
# can be specified as a relative path some/where/else;
|
|
||||||
# this is interpreted as relative to $(prefix) and "perf" at
|
|
||||||
# runtime figures out where they are based on the path to the executable.
|
|
||||||
# This can help installing the suite in a relocatable way.
|
|
||||||
|
|
||||||
# Make the path relative to DESTDIR, not to prefix
|
|
||||||
ifndef DESTDIR
|
|
||||||
prefix = $(HOME)
|
|
||||||
endif
|
|
||||||
bindir_relative = bin
|
|
||||||
bindir = $(prefix)/$(bindir_relative)
|
|
||||||
mandir = share/man
|
|
||||||
infodir = share/info
|
|
||||||
perfexecdir = libexec/perf-core
|
|
||||||
sharedir = $(prefix)/share
|
|
||||||
template_dir = share/perf-core/templates
|
|
||||||
htmldir = share/doc/perf-doc
|
|
||||||
ifeq ($(prefix),/usr)
|
|
||||||
sysconfdir = /etc
|
|
||||||
ETC_PERFCONFIG = $(sysconfdir)/perfconfig
|
|
||||||
else
|
|
||||||
sysconfdir = $(prefix)/etc
|
|
||||||
ETC_PERFCONFIG = etc/perfconfig
|
|
||||||
endif
|
|
||||||
lib = lib
|
|
||||||
|
|
||||||
export prefix bindir sharedir sysconfdir
|
export prefix bindir sharedir sysconfdir
|
||||||
|
|
||||||
# sparse is architecture-neutral, which means that we need to tell it
|
# sparse is architecture-neutral, which means that we need to tell it
|
||||||
@ -555,23 +522,6 @@ endif
|
|||||||
endif # MAKECMDGOALS != tags
|
endif # MAKECMDGOALS != tags
|
||||||
endif # MAKECMDGOALS != clean
|
endif # MAKECMDGOALS != clean
|
||||||
|
|
||||||
# Shell quote (do not use $(call) to accommodate ancient setups);
|
|
||||||
|
|
||||||
ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG))
|
|
||||||
|
|
||||||
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
|
||||||
bindir_SQ = $(subst ','\'',$(bindir))
|
|
||||||
bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
|
|
||||||
mandir_SQ = $(subst ','\'',$(mandir))
|
|
||||||
infodir_SQ = $(subst ','\'',$(infodir))
|
|
||||||
perfexecdir_SQ = $(subst ','\'',$(perfexecdir))
|
|
||||||
template_dir_SQ = $(subst ','\'',$(template_dir))
|
|
||||||
htmldir_SQ = $(subst ','\'',$(htmldir))
|
|
||||||
prefix_SQ = $(subst ','\'',$(prefix))
|
|
||||||
sysconfdir_SQ = $(subst ','\'',$(sysconfdir))
|
|
||||||
|
|
||||||
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
|
||||||
|
|
||||||
LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
|
LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
|
||||||
|
|
||||||
ALL_CFLAGS += $(BASIC_CFLAGS)
|
ALL_CFLAGS += $(BASIC_CFLAGS)
|
||||||
@ -580,7 +530,6 @@ ALL_LDFLAGS += $(BASIC_LDFLAGS)
|
|||||||
|
|
||||||
export INSTALL SHELL_PATH
|
export INSTALL SHELL_PATH
|
||||||
|
|
||||||
|
|
||||||
### Build rules
|
### Build rules
|
||||||
|
|
||||||
SHELL = $(SHELL_PATH)
|
SHELL = $(SHELL_PATH)
|
||||||
@ -822,13 +771,6 @@ check: $(OUTPUT)common-cmds.h
|
|||||||
|
|
||||||
### Installation rules
|
### Installation rules
|
||||||
|
|
||||||
ifneq ($(filter /%,$(firstword $(perfexecdir))),)
|
|
||||||
perfexec_instdir = $(perfexecdir)
|
|
||||||
else
|
|
||||||
perfexec_instdir = $(prefix)/$(perfexecdir)
|
|
||||||
endif
|
|
||||||
perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))
|
|
||||||
|
|
||||||
install-bin: all
|
install-bin: all
|
||||||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
||||||
$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'
|
$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'
|
||||||
|
@ -390,3 +390,55 @@ ifndef NO_LIBNUMA
|
|||||||
EXTLIBS += -lnuma
|
EXTLIBS += -lnuma
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Among the variables below, these:
|
||||||
|
# perfexecdir
|
||||||
|
# template_dir
|
||||||
|
# mandir
|
||||||
|
# infodir
|
||||||
|
# htmldir
|
||||||
|
# ETC_PERFCONFIG (but not sysconfdir)
|
||||||
|
# can be specified as a relative path some/where/else;
|
||||||
|
# this is interpreted as relative to $(prefix) and "perf" at
|
||||||
|
# runtime figures out where they are based on the path to the executable.
|
||||||
|
# This can help installing the suite in a relocatable way.
|
||||||
|
|
||||||
|
# Make the path relative to DESTDIR, not to prefix
|
||||||
|
ifndef DESTDIR
|
||||||
|
prefix = $(HOME)
|
||||||
|
endif
|
||||||
|
bindir_relative = bin
|
||||||
|
bindir = $(prefix)/$(bindir_relative)
|
||||||
|
mandir = share/man
|
||||||
|
infodir = share/info
|
||||||
|
perfexecdir = libexec/perf-core
|
||||||
|
sharedir = $(prefix)/share
|
||||||
|
template_dir = share/perf-core/templates
|
||||||
|
htmldir = share/doc/perf-doc
|
||||||
|
ifeq ($(prefix),/usr)
|
||||||
|
sysconfdir = /etc
|
||||||
|
ETC_PERFCONFIG = $(sysconfdir)/perfconfig
|
||||||
|
else
|
||||||
|
sysconfdir = $(prefix)/etc
|
||||||
|
ETC_PERFCONFIG = etc/perfconfig
|
||||||
|
endif
|
||||||
|
lib = lib
|
||||||
|
|
||||||
|
# Shell quote (do not use $(call) to accommodate ancient setups);
|
||||||
|
ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG))
|
||||||
|
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
||||||
|
bindir_SQ = $(subst ','\'',$(bindir))
|
||||||
|
mandir_SQ = $(subst ','\'',$(mandir))
|
||||||
|
infodir_SQ = $(subst ','\'',$(infodir))
|
||||||
|
perfexecdir_SQ = $(subst ','\'',$(perfexecdir))
|
||||||
|
template_dir_SQ = $(subst ','\'',$(template_dir))
|
||||||
|
htmldir_SQ = $(subst ','\'',$(htmldir))
|
||||||
|
prefix_SQ = $(subst ','\'',$(prefix))
|
||||||
|
sysconfdir_SQ = $(subst ','\'',$(sysconfdir))
|
||||||
|
|
||||||
|
ifneq ($(filter /%,$(firstword $(perfexecdir))),)
|
||||||
|
perfexec_instdir = $(perfexecdir)
|
||||||
|
else
|
||||||
|
perfexec_instdir = $(prefix)/$(perfexecdir)
|
||||||
|
endif
|
||||||
|
perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))
|
||||||
|
Loading…
Reference in New Issue
Block a user