diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-06 09:02:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-06 09:02:34 -0400 |
| commit | d9b2002c406011164f245de7a81304625989f1c9 (patch) | |
| tree | a2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /tools/perf/Makefile | |
| parent | c3b32fcbc7f4fd9a9b84718b991b175b0fd53f8c (diff) | |
| parent | 906010b2134e14a2e377decbadd357b3d0ab9c6a (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
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 2c309a5c6868..5a429966c995 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -732,7 +732,7 @@ $(BUILT_INS): perf$X | |||
| 732 | common-cmds.h: util/generate-cmdlist.sh command-list.txt | 732 | common-cmds.h: util/generate-cmdlist.sh command-list.txt |
| 733 | 733 | ||
| 734 | common-cmds.h: $(wildcard Documentation/perf-*.txt) | 734 | common-cmds.h: $(wildcard Documentation/perf-*.txt) |
| 735 | $(QUIET_GEN)util/generate-cmdlist.sh > $@+ && mv $@+ $@ | 735 | $(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@ |
| 736 | 736 | ||
| 737 | $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh | 737 | $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh |
| 738 | $(QUIET_GEN)$(RM) $@ $@+ && \ | 738 | $(QUIET_GEN)$(RM) $@ $@+ && \ |