On 1/20/15 9:39 AM, Jiri Olsa wrote:
Move the rest of builtin objects (bench and test are
already in) building under build framework.
Signed-off-by: Jiri Olsa <[email protected]>
Cc: Alexis Berlemont <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Corey Ashford <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
---
tools/perf/Build | 29 +++++++++++++++++++++++++++++
tools/perf/Makefile.perf | 35 -----------------------------------
tools/perf/config/Makefile | 4 ++++
3 files changed, 33 insertions(+), 35 deletions(-)
This one fails to build:
$ git --no-pager log --oneline -1
cd2a9b144028 perf build: Add builtin objects building
$ make O=/tmp/junk
...
builtin-help.c:10:25: fatal error: common-cmds.h: No such file or directory
compilation terminated.
CC /tmp/junk/fs/fs.o
CC /tmp/junk/builtin-script.o
CC /tmp/junk/builtin-kmem.o
CC /tmp/junk/perf-read-vdso32
CC /tmp/junk/ui/gtk/browser.o
CC /tmp/junk/fd/array.o
CC /tmp/junk/ui/gtk/hists.o
CC /tmp/junk/builtin-lock.o
make[2]: *** [/tmp/junk/builtin-help.o] Error 1
make[2]: *** Waiting for unfinished jobs....
Probably due to this change:
@@ -591,18 +568,6 @@ $(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H)
$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS)
$(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)
-$(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h
$(OUTPUT)PERF-CFLAGS
- $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \
- '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
- '-DPERF_MAN_PATH="$(mandir_SQ)"' \
- '-DPERF_INFO_PATH="$(infodir_SQ)"' $<
-
-$(OUTPUT)builtin-timechart.o: builtin-timechart.c $(OUTPUT)common-cmds.h
$(OUTPUT)PERF-CFLAGS
- $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \
- '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
- '-DPERF_MAN_PATH="$(mandir_SQ)"' \
- '-DPERF_INFO_PATH="$(infodir_SQ)"' $<
-
David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
