Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c53746e authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Switch to full path C include directories 



Switching to full path C include directories, to make the includes
clear. Plus little include cleanup.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.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-21-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1e9f7aad

tools/perf/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -80,8 +80,8 @@ FLEX = flex 
BISON   = bison

BISON   = bison

STRIP  ?= strip

STRIP  ?= strip





LK_DIR = ../lib/lk/

LK_DIR          = $(srctree)/tools/lib/lk/

TRACE_EVENT_DIR = ../lib/traceevent/

TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/





# include config/Makefile by default and rule out

# include config/Makefile by default and rule out

# non-config cases

# non-config cases

tools/perf/config/Makefile

+37 −12
Original line number Original line Diff line number Diff line
@@ -34,7 +34,23 @@ ifeq ($(NO_PERF_REGS),0) 
        CFLAGS += -DHAVE_PERF_REGS

        CFLAGS += -DHAVE_PERF_REGS

endif

endif





-include config/feature-tests.mak

ifeq ($(src-perf),)

src-perf := $(srctree)/tools/perf

endif



ifeq ($(obj-perf),)

obj-perf := $(objtree)

endif



ifneq ($(obj-perf),)

obj-perf := $(abspath $(obj-perf))/

endif



# include ARCH specific config

-include $(src-perf)/arch/$(ARCH)/Makefile



include $(src-perf)/config/feature-tests.mak

include $(src-perf)/config/utilities.mak





ifeq ($(call get-executable,$(FLEX)),)

ifeq ($(call get-executable,$(FLEX)),)

	dummy := $(error Error: $(FLEX) is missing on this system, please install it)

	dummy := $(error Error: $(FLEX) is missing on this system, please install it)
@@ -91,19 +107,28 @@ ifndef PERF_DEBUG 
endif

endif





CFLAGS += \

CFLAGS += \

	-Iutil/include \

	-I$(src-perf)/util/include \

	-Iarch/$(ARCH)/include \

	-I$(src-perf)/arch/$(ARCH)/include \

	$(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \

	-I$(srctree)/arch/$(ARCH)/include/uapi \

	-I$(srctree)/arch/$(ARCH)/include/uapi \

	-I$(srctree)/arch/$(ARCH)/include \

	-I$(srctree)/arch/$(ARCH)/include \

	$(if $(objtree),-I$(objtree)/include/generated/uapi) \

	-I$(srctree)/include/uapi \

	-I$(srctree)/include/uapi \

	-I$(srctree)/include \

	-I$(srctree)/include

	-I$(OUTPUT)util \



	-Iutil \

# $(obj-perf)      for generated common-cmds.h

	-I. \

# $(obj-perf)/util for generated bison/flex headers

ifneq ($(OUTPUT),)

CFLAGS += \

	-I$(obj-perf)/util \

	-I$(obj-perf)

endif



CFLAGS += \

	-I$(src-perf)/util \

	-I$(src-perf) \

	-I$(TRACE_EVENT_DIR) \

	-I$(TRACE_EVENT_DIR) \

	-I../lib/ \

	-I$(srctree)/tools/lib/



CFLAGS += \

	-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

	-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE





ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)

ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
@@ -159,7 +184,7 @@ ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y) 
endif

endif





# include ARCH specific config

# include ARCH specific config

-include arch/$(ARCH)/Makefile

-include $(src-perf)/arch/$(ARCH)/Makefile





ifndef NO_DWARF

ifndef NO_DWARF

ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)

ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
@@ -329,7 +354,7 @@ else 
        else

        else

          LDFLAGS += $(PYTHON_EMBED_LDFLAGS)

          LDFLAGS += $(PYTHON_EMBED_LDFLAGS)

          EXTLIBS += $(PYTHON_EMBED_LIBADD)

          EXTLIBS += $(PYTHON_EMBED_LIBADD)

          LANG_BINDINGS += $(OUTPUT)python/perf.so

          LANG_BINDINGS += $(obj-perf)python/perf.so

        endif

        endif

      endif

      endif

    endif

    endif