aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/Makefile.perf
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2014-12-30 10:51:35 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-02-12 15:41:31 -0500
commit8e499ac5376c03fa3ff90ddd7def3fee175aa4b6 (patch)
tree3fde721f37cca3aa82ec6ec5a4681b2c5dcb72dd /tools/perf/Makefile.perf
parent64f72f3b7316793ba03bc38f5c3cfc627068afe4 (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.perf125
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
137SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ 137SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
138 138
139# Guard against environment variables 139# Guard against environment variables
140BUILTIN_OBJS =
141LIB_H =
142LIB_OBJS =
143GTK_OBJS =
144PYRF_OBJS = 140PYRF_OBJS =
145SCRIPT_SH = 141SCRIPT_SH =
146 142
@@ -218,115 +214,6 @@ export PERL_PATH
218 214
219LIB_FILE=$(OUTPUT)libperf.a 215LIB_FILE=$(OUTPUT)libperf.a
220 216
221LIB_H += ../lib/symbol/kallsyms.h
222LIB_H += ../../include/uapi/linux/perf_event.h
223LIB_H += ../../include/linux/rbtree.h
224LIB_H += ../../include/linux/list.h
225LIB_H += ../../include/uapi/linux/const.h
226LIB_H += ../include/linux/hash.h
227LIB_H += ../../include/linux/stringify.h
228LIB_H += util/include/linux/bitmap.h
229LIB_H += ../include/linux/bitops.h
230LIB_H += ../include/asm-generic/bitops/arch_hweight.h
231LIB_H += ../include/asm-generic/bitops/atomic.h
232LIB_H += ../include/asm-generic/bitops/const_hweight.h
233LIB_H += ../include/asm-generic/bitops/find.h
234LIB_H += ../include/asm-generic/bitops/fls64.h
235LIB_H += ../include/asm-generic/bitops/fls.h
236LIB_H += ../include/asm-generic/bitops/__ffs.h
237LIB_H += ../include/asm-generic/bitops/__fls.h
238LIB_H += ../include/asm-generic/bitops/hweight.h
239LIB_H += ../include/asm-generic/bitops.h
240LIB_H += ../include/linux/compiler.h
241LIB_H += ../include/linux/log2.h
242LIB_H += util/include/linux/const.h
243LIB_H += util/include/linux/ctype.h
244LIB_H += util/include/linux/kernel.h
245LIB_H += util/include/linux/list.h
246LIB_H += ../include/linux/export.h
247LIB_H += util/include/linux/poison.h
248LIB_H += util/include/linux/rbtree.h
249LIB_H += util/include/linux/rbtree_augmented.h
250LIB_H += util/include/linux/string.h
251LIB_H += ../include/linux/types.h
252LIB_H += util/include/linux/linkage.h
253LIB_H += util/include/asm/asm-offsets.h
254LIB_H += ../include/asm/bug.h
255LIB_H += util/include/asm/byteorder.h
256LIB_H += util/include/asm/swab.h
257LIB_H += util/include/asm/system.h
258LIB_H += util/include/asm/uaccess.h
259LIB_H += util/include/dwarf-regs.h
260LIB_H += util/include/asm/dwarf2.h
261LIB_H += util/include/asm/cpufeature.h
262LIB_H += util/include/asm/unistd_32.h
263LIB_H += util/include/asm/unistd_64.h
264LIB_H += perf.h
265LIB_H += util/annotate.h
266LIB_H += util/cache.h
267LIB_H += util/callchain.h
268LIB_H += util/build-id.h
269LIB_H += util/db-export.h
270LIB_H += util/debug.h
271LIB_H += util/pmu.h
272LIB_H += util/event.h
273LIB_H += util/evsel.h
274LIB_H += util/evlist.h
275LIB_H += util/exec_cmd.h
276LIB_H += util/find-vdso-map.c
277LIB_H += util/levenshtein.h
278LIB_H += util/machine.h
279LIB_H += util/map.h
280LIB_H += util/parse-options.h
281LIB_H += util/parse-events.h
282LIB_H += util/quote.h
283LIB_H += util/util.h
284LIB_H += util/xyarray.h
285LIB_H += util/header.h
286LIB_H += util/help.h
287LIB_H += util/session.h
288LIB_H += util/ordered-events.h
289LIB_H += util/strbuf.h
290LIB_H += util/strlist.h
291LIB_H += util/strfilter.h
292LIB_H += util/svghelper.h
293LIB_H += util/tool.h
294LIB_H += util/run-command.h
295LIB_H += util/sigchain.h
296LIB_H += util/dso.h
297LIB_H += util/symbol.h
298LIB_H += util/color.h
299LIB_H += util/values.h
300LIB_H += util/sort.h
301LIB_H += util/hist.h
302LIB_H += util/comm.h
303LIB_H += util/thread.h
304LIB_H += util/thread_map.h
305LIB_H += util/trace-event.h
306LIB_H += util/probe-finder.h
307LIB_H += util/dwarf-aux.h
308LIB_H += util/probe-event.h
309LIB_H += util/pstack.h
310LIB_H += util/cpumap.h
311LIB_H += util/top.h
312LIB_H += $(ARCH_INCLUDE)
313LIB_H += util/cgroup.h
314LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h
315LIB_H += util/target.h
316LIB_H += util/rblist.h
317LIB_H += util/intlist.h
318LIB_H += util/perf_regs.h
319LIB_H += util/unwind.h
320LIB_H += util/vdso.h
321LIB_H += util/tsc.h
322LIB_H += ui/helpline.h
323LIB_H += ui/progress.h
324LIB_H += ui/util.h
325LIB_H += ui/ui.h
326LIB_H += util/data.h
327LIB_H += util/kvm-stat.h
328LIB_H += util/thread-stack.h
329
330PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT) 217PERFLIBS = $(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
463endif 349endif
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
468LIBPERF_IN := $(OUTPUT)libperf-in.o 353LIBPERF_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
657clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean 542clean: $(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