diff options
author | Jiri Olsa <jolsa@kernel.org> | 2014-12-30 10:51:35 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-12 15:41:31 -0500 |
commit | 8e499ac5376c03fa3ff90ddd7def3fee175aa4b6 (patch) | |
tree | 3fde721f37cca3aa82ec6ec5a4681b2c5dcb72dd /tools/perf/Makefile.perf | |
parent | 64f72f3b7316793ba03bc38f5c3cfc627068afe4 (diff) |
perf build: Remove uneeded variables
Removing uneeded variables from Makefile.perf:
BUILTIN_OBJS LIB_OBJS GTK_OBJS
- objects are now hold by in the build Makefiles
LIB_H
- header dependencies iare now handled by Build
framework
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-o85k0klhwqh3fmvryfgcpr95@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile.perf')
-rw-r--r-- | tools/perf/Makefile.perf | 125 |
1 files changed, 5 insertions, 120 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index b282cbcf2ac7..d49f7930d544 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -137,10 +137,6 @@ export prefix bindir sharedir sysconfdir DESTDIR | |||
137 | SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ | 137 | SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ |
138 | 138 | ||
139 | # Guard against environment variables | 139 | # Guard against environment variables |
140 | BUILTIN_OBJS = | ||
141 | LIB_H = | ||
142 | LIB_OBJS = | ||
143 | GTK_OBJS = | ||
144 | PYRF_OBJS = | 140 | PYRF_OBJS = |
145 | SCRIPT_SH = | 141 | SCRIPT_SH = |
146 | 142 | ||
@@ -218,115 +214,6 @@ export PERL_PATH | |||
218 | 214 | ||
219 | LIB_FILE=$(OUTPUT)libperf.a | 215 | LIB_FILE=$(OUTPUT)libperf.a |
220 | 216 | ||
221 | LIB_H += ../lib/symbol/kallsyms.h | ||
222 | LIB_H += ../../include/uapi/linux/perf_event.h | ||
223 | LIB_H += ../../include/linux/rbtree.h | ||
224 | LIB_H += ../../include/linux/list.h | ||
225 | LIB_H += ../../include/uapi/linux/const.h | ||
226 | LIB_H += ../include/linux/hash.h | ||
227 | LIB_H += ../../include/linux/stringify.h | ||
228 | LIB_H += util/include/linux/bitmap.h | ||
229 | LIB_H += ../include/linux/bitops.h | ||
230 | LIB_H += ../include/asm-generic/bitops/arch_hweight.h | ||
231 | LIB_H += ../include/asm-generic/bitops/atomic.h | ||
232 | LIB_H += ../include/asm-generic/bitops/const_hweight.h | ||
233 | LIB_H += ../include/asm-generic/bitops/find.h | ||
234 | LIB_H += ../include/asm-generic/bitops/fls64.h | ||
235 | LIB_H += ../include/asm-generic/bitops/fls.h | ||
236 | LIB_H += ../include/asm-generic/bitops/__ffs.h | ||
237 | LIB_H += ../include/asm-generic/bitops/__fls.h | ||
238 | LIB_H += ../include/asm-generic/bitops/hweight.h | ||
239 | LIB_H += ../include/asm-generic/bitops.h | ||
240 | LIB_H += ../include/linux/compiler.h | ||
241 | LIB_H += ../include/linux/log2.h | ||
242 | LIB_H += util/include/linux/const.h | ||
243 | LIB_H += util/include/linux/ctype.h | ||
244 | LIB_H += util/include/linux/kernel.h | ||
245 | LIB_H += util/include/linux/list.h | ||
246 | LIB_H += ../include/linux/export.h | ||
247 | LIB_H += util/include/linux/poison.h | ||
248 | LIB_H += util/include/linux/rbtree.h | ||
249 | LIB_H += util/include/linux/rbtree_augmented.h | ||
250 | LIB_H += util/include/linux/string.h | ||
251 | LIB_H += ../include/linux/types.h | ||
252 | LIB_H += util/include/linux/linkage.h | ||
253 | LIB_H += util/include/asm/asm-offsets.h | ||
254 | LIB_H += ../include/asm/bug.h | ||
255 | LIB_H += util/include/asm/byteorder.h | ||
256 | LIB_H += util/include/asm/swab.h | ||
257 | LIB_H += util/include/asm/system.h | ||
258 | LIB_H += util/include/asm/uaccess.h | ||
259 | LIB_H += util/include/dwarf-regs.h | ||
260 | LIB_H += util/include/asm/dwarf2.h | ||
261 | LIB_H += util/include/asm/cpufeature.h | ||
262 | LIB_H += util/include/asm/unistd_32.h | ||
263 | LIB_H += util/include/asm/unistd_64.h | ||
264 | LIB_H += perf.h | ||
265 | LIB_H += util/annotate.h | ||
266 | LIB_H += util/cache.h | ||
267 | LIB_H += util/callchain.h | ||
268 | LIB_H += util/build-id.h | ||
269 | LIB_H += util/db-export.h | ||
270 | LIB_H += util/debug.h | ||
271 | LIB_H += util/pmu.h | ||
272 | LIB_H += util/event.h | ||
273 | LIB_H += util/evsel.h | ||
274 | LIB_H += util/evlist.h | ||
275 | LIB_H += util/exec_cmd.h | ||
276 | LIB_H += util/find-vdso-map.c | ||
277 | LIB_H += util/levenshtein.h | ||
278 | LIB_H += util/machine.h | ||
279 | LIB_H += util/map.h | ||
280 | LIB_H += util/parse-options.h | ||
281 | LIB_H += util/parse-events.h | ||
282 | LIB_H += util/quote.h | ||
283 | LIB_H += util/util.h | ||
284 | LIB_H += util/xyarray.h | ||
285 | LIB_H += util/header.h | ||
286 | LIB_H += util/help.h | ||
287 | LIB_H += util/session.h | ||
288 | LIB_H += util/ordered-events.h | ||
289 | LIB_H += util/strbuf.h | ||
290 | LIB_H += util/strlist.h | ||
291 | LIB_H += util/strfilter.h | ||
292 | LIB_H += util/svghelper.h | ||
293 | LIB_H += util/tool.h | ||
294 | LIB_H += util/run-command.h | ||
295 | LIB_H += util/sigchain.h | ||
296 | LIB_H += util/dso.h | ||
297 | LIB_H += util/symbol.h | ||
298 | LIB_H += util/color.h | ||
299 | LIB_H += util/values.h | ||
300 | LIB_H += util/sort.h | ||
301 | LIB_H += util/hist.h | ||
302 | LIB_H += util/comm.h | ||
303 | LIB_H += util/thread.h | ||
304 | LIB_H += util/thread_map.h | ||
305 | LIB_H += util/trace-event.h | ||
306 | LIB_H += util/probe-finder.h | ||
307 | LIB_H += util/dwarf-aux.h | ||
308 | LIB_H += util/probe-event.h | ||
309 | LIB_H += util/pstack.h | ||
310 | LIB_H += util/cpumap.h | ||
311 | LIB_H += util/top.h | ||
312 | LIB_H += $(ARCH_INCLUDE) | ||
313 | LIB_H += util/cgroup.h | ||
314 | LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h | ||
315 | LIB_H += util/target.h | ||
316 | LIB_H += util/rblist.h | ||
317 | LIB_H += util/intlist.h | ||
318 | LIB_H += util/perf_regs.h | ||
319 | LIB_H += util/unwind.h | ||
320 | LIB_H += util/vdso.h | ||
321 | LIB_H += util/tsc.h | ||
322 | LIB_H += ui/helpline.h | ||
323 | LIB_H += ui/progress.h | ||
324 | LIB_H += ui/util.h | ||
325 | LIB_H += ui/ui.h | ||
326 | LIB_H += util/data.h | ||
327 | LIB_H += util/kvm-stat.h | ||
328 | LIB_H += util/thread-stack.h | ||
329 | |||
330 | PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT) | 217 | PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT) |
331 | 218 | ||
332 | # We choose to avoid "if .. else if .. else .. endif endif" | 219 | # We choose to avoid "if .. else if .. else .. endif endif" |
@@ -379,9 +266,8 @@ build := -f $(srctree)/tools/build/Makefile.build dir=. obj | |||
379 | $(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE | 266 | $(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE |
380 | @$(MAKE) $(build)=perf | 267 | @$(MAKE) $(build)=perf |
381 | 268 | ||
382 | $(OUTPUT)perf: $(BUILTIN_OBJS) $(PERFLIBS) $(PERF_IN) | 269 | $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) |
383 | $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ | 270 | $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(PERF_IN) $(LIBS) -o $@ |
384 | $(BUILTIN_OBJS) $(PERF_IN) $(LIBS) -o $@ | ||
385 | 271 | ||
386 | $(GTK_IN): FORCE | 272 | $(GTK_IN): FORCE |
387 | @$(MAKE) $(build)=gtk | 273 | @$(MAKE) $(build)=gtk |
@@ -462,15 +348,14 @@ $(OUTPUT)perf-read-vdsox32: perf-read-vdso.c util/find-vdso-map.c | |||
462 | $(QUIET_CC)$(CC) -mx32 $(filter -static,$(LDFLAGS)) -Wall -Werror -o $@ perf-read-vdso.c | 348 | $(QUIET_CC)$(CC) -mx32 $(filter -static,$(LDFLAGS)) -Wall -Werror -o $@ perf-read-vdso.c |
463 | endif | 349 | endif |
464 | 350 | ||
465 | $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) | 351 | $(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h) |
466 | $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) | ||
467 | 352 | ||
468 | LIBPERF_IN := $(OUTPUT)libperf-in.o | 353 | LIBPERF_IN := $(OUTPUT)libperf-in.o |
469 | 354 | ||
470 | $(LIBPERF_IN): FORCE | 355 | $(LIBPERF_IN): FORCE |
471 | @$(MAKE) $(build)=libperf | 356 | @$(MAKE) $(build)=libperf |
472 | 357 | ||
473 | $(LIB_FILE): $(LIB_OBJS) $(LIBPERF_IN) | 358 | $(LIB_FILE): $(LIBPERF_IN) |
474 | $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS) | 359 | $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS) |
475 | 360 | ||
476 | # libtraceevent.a | 361 | # libtraceevent.a |
@@ -655,7 +540,7 @@ config-clean: | |||
655 | @$(MAKE) -C config/feature-checks clean >/dev/null | 540 | @$(MAKE) -C config/feature-checks clean >/dev/null |
656 | 541 | ||
657 | clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean | 542 | clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean |
658 | $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) | 543 | $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) |
659 | @find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete | 544 | @find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete |
660 | @$(RM) .config-detected | 545 | @$(RM) .config-detected |
661 | $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 | 546 | $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 |