diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-05 03:47:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-05 03:47:14 -0400 |
| commit | 00e8976200665eec2fa9264d61885b4d1384d4f0 (patch) | |
| tree | 5554648e4411fcd6909214f71370348567cf4b2d /tools/perf/Makefile | |
| parent | 540804b5c52065a87d826f7714b18a3ec0b269f9 (diff) | |
| parent | 0f940cb7d970f4fd569bb5f9f49774422f2ccbee (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/ui/browsers/hists.c
Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/Makefile')
| -rw-r--r-- | tools/perf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index fe1e30722f3b..d1db0f676a4b 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -1035,7 +1035,7 @@ builtin-revert.o wt-status.o: wt-status.h | |||
| 1035 | # we compile into subdirectories. if the target directory is not the source directory, they might not exists. So | 1035 | # we compile into subdirectories. if the target directory is not the source directory, they might not exists. So |
| 1036 | # we depend the various files onto their directories. | 1036 | # we depend the various files onto their directories. |
| 1037 | DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h | 1037 | DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h |
| 1038 | $(DIRECTORY_DEPS): $(sort $(dir $(DIRECTORY_DEPS))) | 1038 | $(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS))) |
| 1039 | # In the second step, we make a rule to actually create these directories | 1039 | # In the second step, we make a rule to actually create these directories |
| 1040 | $(sort $(dir $(DIRECTORY_DEPS))): | 1040 | $(sort $(dir $(DIRECTORY_DEPS))): |
| 1041 | $(QUIET_MKDIR)$(MKDIR) -p $@ 2>/dev/null | 1041 | $(QUIET_MKDIR)$(MKDIR) -p $@ 2>/dev/null |