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

Commit aca7a94d authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move UI bits to tools/perf/ui directory 



Move those files to new directory in order to be prepared to further UI
work. Makefile and header file pathes are adjusted accordingly.

Signed-off-by: default avatarNamhyung Kim <namhyung.kim@lge.com>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/1333523666-12057-1-git-send-email-namhyung.kim@lge.com


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

tools/perf/Makefile

+20 −20
Original line number Diff line number Diff line
@@ -473,22 +473,22 @@ else 
		# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h

		BASIC_CFLAGS += -I/usr/include/slang

		EXTLIBS += -lnewt -lslang

		LIB_OBJS += $(OUTPUT)util/ui/setup.o

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

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

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

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

		LIB_OBJS += $(OUTPUT)util/ui/helpline.o

		LIB_OBJS += $(OUTPUT)util/ui/progress.o

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

		LIB_H += util/ui/browser.h

		LIB_H += util/ui/browsers/map.h

		LIB_H += util/ui/helpline.h

		LIB_H += util/ui/keysyms.h

		LIB_H += util/ui/libslang.h

		LIB_H += util/ui/progress.h

		LIB_H += util/ui/util.h

		LIB_H += util/ui/ui.h

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

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

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

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

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

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

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

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

		LIB_H += ui/browser.h

		LIB_H += ui/browsers/map.h

		LIB_H += ui/helpline.h

		LIB_H += ui/keysyms.h

		LIB_H += ui/libslang.h

		LIB_H += ui/progress.h

		LIB_H += ui/util.h

		LIB_H += ui/ui.h

	endif

endif
@@ -755,16 +755,16 @@ $(OUTPUT)util/exec_cmd.o: util/exec_cmd.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/ui/browser.o: util/ui/browser.c $(OUTPUT)PERF-CFLAGS

$(OUTPUT)ui/browser.o: ui/browser.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/ui/browsers/annotate.o: util/ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS

$(OUTPUT)ui/browsers/annotate.o: ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/ui/browsers/hists.o: util/ui/browsers/hists.c $(OUTPUT)PERF-CFLAGS

$(OUTPUT)ui/browsers/hists.o: ui/browsers/hists.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/ui/browsers/map.o: util/ui/browsers/map.c $(OUTPUT)PERF-CFLAGS

$(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS

tools/perf/util/ui/browser.c→tools/perf/ui/browser.c

+0 −0

File moved.

View file

tools/perf/util/ui/browser.h→tools/perf/ui/browser.h

+0 −0

File moved.

View file

tools/perf/util/ui/browsers/annotate.c→tools/perf/ui/browsers/annotate.c

+5 −5
Original line number Diff line number Diff line 
#include "../../util.h"

#include "../../util/util.h"

#include "../browser.h"

#include "../helpline.h"

#include "../libslang.h"

#include "../ui.h"

#include "../util.h"

#include "../../annotate.h"

#include "../../hist.h"

#include "../../sort.h"

#include "../../symbol.h"

#include "../../util/annotate.h"

#include "../../util/hist.h"

#include "../../util/sort.h"

#include "../../util/symbol.h"

#include <pthread.h>

#include <newt.h>

tools/perf/util/ui/browsers/hists.c→tools/perf/ui/browsers/hists.c

+6 −6
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
#include <newt.h>

#include <linux/rbtree.h>



#include "../../evsel.h"

#include "../../evlist.h"

#include "../../hist.h"

#include "../../pstack.h"

#include "../../sort.h"

#include "../../util.h"

#include "../../util/evsel.h"

#include "../../util/evlist.h"

#include "../../util/hist.h"

#include "../../util/pstack.h"

#include "../../util/sort.h"

#include "../../util/util.h"



#include "../browser.h"

#include "../helpline.h"