Commit 4a8f888a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move slang check config into config/Makefile 



Moving slang check config into config/Makefile.

Signed-off-by: default avatarJiri 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-10-git-send-email-jolsa@redhat.com


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

tools/perf/Makefile

+13 −26
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ ifeq ($(config),1) 
include config/Makefile

endif



ifdef NO_NEWT

	NO_SLANG=1

endif



# Among the variables below, these:

#   perfexecdir

#   template_dir
@@ -509,14 +505,6 @@ ifndef NO_LIBAUDIT 
endif



ifndef NO_SLANG

	FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang

	ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y)

		msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev);

	else

		# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h

		BASIC_CFLAGS += -I/usr/include/slang

		BASIC_CFLAGS += -DSLANG_SUPPORT

		EXTLIBS += -lslang

	LIB_OBJS += $(OUTPUT)ui/browser.o

	LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o

	LIB_OBJS += $(OUTPUT)ui/browsers/hists.o
@@ -531,7 +519,6 @@ ifndef NO_SLANG 
	LIB_H += ui/keysyms.h

	LIB_H += ui/libslang.h

endif

endif



ifndef NO_GTK2

	FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)

tools/perf/config/Makefile

+17 −0
Original line number Diff line number Diff line
@@ -208,3 +208,20 @@ ifndef NO_LIBAUDIT 
		EXTLIBS += -laudit

	endif

endif



ifdef NO_NEWT

	NO_SLANG=1

endif



ifndef NO_SLANG

	FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang

	ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y)

		msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev);

		NO_SLANG := 1

	else

		# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h

		BASIC_CFLAGS += -I/usr/include/slang

		BASIC_CFLAGS += -DSLANG_SUPPORT

		EXTLIBS += -lslang

	endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE