diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2013-03-21 06:41:05 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-30 09:31:42 -0400 |
| commit | 1e9f7aad3f5ed32e82bb6dea7afccbdb607c2ea3 (patch) | |
| tree | 5a3748e9536f0f7855767340558e54a6a22a3906 /tools/perf/Makefile | |
| parent | 9c12cf95b32a099ac92ef0e9d138acb4bef984be (diff) | |
perf tools: Merge all *LDFLAGS* make variable into LDFLAGS
Merging all *LDFLAGS* make variable into LDFLAGS to eliminate all
special *LDFLAGS* variables and make the setup clear.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-20-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile')
| -rw-r--r-- | tools/perf/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 58275f2b566e..1a3557c09098 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -513,8 +513,6 @@ endif | |||
| 513 | 513 | ||
| 514 | LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group | 514 | LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group |
| 515 | 515 | ||
| 516 | ALL_LDFLAGS += $(BASIC_LDFLAGS) | ||
| 517 | |||
| 518 | export INSTALL SHELL_PATH | 516 | export INSTALL SHELL_PATH |
| 519 | 517 | ||
| 520 | ### Build rules | 518 | ### Build rules |
| @@ -537,7 +535,7 @@ $(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS | |||
| 537 | $(CFLAGS) -c $(filter %.c,$^) -o $@ | 535 | $(CFLAGS) -c $(filter %.c,$^) -o $@ |
| 538 | 536 | ||
| 539 | $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) | 537 | $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) |
| 540 | $(QUIET_LINK)$(CC) $(CFLAGS) $(ALL_LDFLAGS) $(OUTPUT)perf.o \ | 538 | $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(OUTPUT)perf.o \ |
| 541 | $(BUILTIN_OBJS) $(LIBS) -o $@ | 539 | $(BUILTIN_OBJS) $(LIBS) -o $@ |
| 542 | 540 | ||
| 543 | $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS | 541 | $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS |
| @@ -642,7 +640,7 @@ $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o: scripts/python/Perf-Trace-Uti | |||
| 642 | $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs $< | 640 | $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs $< |
| 643 | 641 | ||
| 644 | $(OUTPUT)perf-%: %.o $(PERFLIBS) | 642 | $(OUTPUT)perf-%: %.o $(PERFLIBS) |
| 645 | $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) | 643 | $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(filter %.o,$^) $(LIBS) |
| 646 | 644 | ||
| 647 | $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) | 645 | $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) |
| 648 | $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) | 646 | $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) |