On Fri, Jan 02, 2015 at 04:36:11PM +0100, Jiri Olsa wrote: > NOTE: hack > > Adding support to configure builtin commands inclusion > in the build, so we could later disable particular > builtin command. > > Signed-off-by: Jiri Olsa <jo...@kernel.org> > Cc: Alexis Berlemont <alexis.berlem...@gmail.com> > Cc: Arnaldo Carvalho de Melo <a...@redhat.com> > Cc: Borislav Petkov <b...@alien8.de> > Cc: Corey Ashford <cjash...@linux.vnet.ibm.com> > Cc: David Ahern <dsah...@gmail.com> > Cc: Frederic Weisbecker <fweis...@gmail.com> > Cc: Ingo Molnar <mi...@kernel.org> > Cc: Namhyung Kim <namhy...@kernel.org> > Cc: Paul Mackerras <pau...@samba.org> > Cc: Peter Zijlstra <pet...@infradead.org> > Cc: Stephane Eranian <eran...@google.com> > --- > tools/perf/Build | 53 > ++++++++++++++++++++----------------- > tools/perf/Makefile.build | 3 +++ > tools/perf/Makefile.perf | 7 +++-- > tools/perf/builtin-cmds.h | 29 ++++++++++++++++++++ > tools/perf/builtin-help.c | 1 + > tools/perf/config.default | 23 ++++++++++++++++ > tools/perf/perf.c | 1 + > tools/perf/util/generate-cmdlist.sh | 10 +++++++ > 8 files changed, 101 insertions(+), 26 deletions(-) > create mode 100644 tools/perf/builtin-cmds.h > create mode 100644 tools/perf/config.default > > diff --git a/tools/perf/Build b/tools/perf/Build > index c95d6378ad65..8e8f2c58f2b0 100644 > --- a/tools/perf/Build > +++ b/tools/perf/Build > @@ -1,29 +1,34 @@ > -perf-y += builtin-bench.o > -perf-y += builtin-annotate.o > -perf-y += builtin-diff.o > -perf-y += builtin-evlist.o > -perf-y += builtin-help.o > -perf-y += builtin-sched.o > -perf-y += builtin-buildid-list.o > -perf-y += builtin-buildid-cache.o > -perf-y += builtin-list.o > -perf-y += builtin-record.o > -perf-y += builtin-report.o > -perf-y += builtin-stat.o > -perf-y += builtin-timechart.o > -perf-y += builtin-top.o > -perf-y += builtin-script.o > -perf-y += builtin-kmem.o > -perf-y += builtin-lock.o > -perf-y += builtin-kvm.o > -perf-y += builtin-inject.o > -perf-y += builtin-mem.o > - > -perf-$(CONFIG_AUDIT) += builtin-trace.o > -perf-$(CONFIG_LIBELF) += builtin-probe.o > +perf-$(CONFIG_BUILTIN_BENCH) += builtin-bench.o > +perf-$(CONFIG_BUILTIN_ANNOTATE) += builtin-annotate.o > +perf-$(CONFIG_BUILTIN_DIFF) += builtin-diff.o > +perf-$(CONFIG_BUILTIN_EVLIST) += builtin-evlist.o > +perf-$(CONFIG_BUILTIN_HELP) += builtin-help.o > +perf-$(CONFIG_BUILTIN_SCHED) += builtin-sched.o > +perf-$(CONFIG_BUILTIN_BUILDID_LIST) += builtin-buildid-list.o > +perf-$(CONFIG_BUILTIN_BUILDID_CACHE) += builtin-buildid-cache.o > +perf-$(CONFIG_BUILTIN_LIST) += builtin-list.o > +perf-$(CONFIG_BUILTIN_RECORD) += builtin-record.o > +perf-$(CONFIG_BUILTIN_REPORT) += builtin-report.o > +perf-$(CONFIG_BUILTIN_STAT) += builtin-stat.o > +perf-$(CONFIG_BUILTIN_TIMECHART) += builtin-timechart.o > +perf-$(CONFIG_BUILTIN_TOP) += builtin-top.o > +perf-$(CONFIG_BUILTIN_SCRIPT) += builtin-script.o > +perf-$(CONFIG_BUILTIN_KMEM) += builtin-kmem.o > +perf-$(CONFIG_BUILTIN_LOCK) += builtin-lock.o > +perf-$(CONFIG_BUILTIN_KVM) += builtin-kvm.o > +perf-$(CONFIG_BUILTIN_INJECT) += builtin-inject.o > +perf-$(CONFIG_BUILTIN_MEM) += builtin-mem.o > + > +ifeq ($(CONFIG_AUDIT),y) > +perf-$(CONFIG_BUILTIN_TRACE) += builtin-trace.o > +endif > + > +ifeq ($(CONFIG_LIBELF),y) > +perf-$(CONFIG_BUILTIN_PROBE) += builtin-probe.o > +endif > > perf-y += bench/
I guess it also needs to be changed like below? perf-$(CONFIG_BUILTIN_BENCH) += bench/ Thanks, Namhyung > -perf-y += tests/ > +perf-$(CONFIG_BUILTIN_TEST) += tests/ > > perf-y += perf.o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
