From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Alexis Berlemont <alexis.berlemont@gmail.com>,
Borislav Petkov <bp@alien8.de>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 29/43] perf build: Remove uneeded variables
Date: Fri, 13 Feb 2015 17:49:18 -0300 [thread overview]
Message-ID: <1423860572-24881-30-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1423860572-24881-1-git-send-email-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
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>
---
tools/perf/Makefile.perf | 125 ++---------------------------------------------
1 file 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
SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
# Guard against environment variables
-BUILTIN_OBJS =
-LIB_H =
-LIB_OBJS =
-GTK_OBJS =
PYRF_OBJS =
SCRIPT_SH =
@@ -218,115 +214,6 @@ export PERL_PATH
LIB_FILE=$(OUTPUT)libperf.a
-LIB_H += ../lib/symbol/kallsyms.h
-LIB_H += ../../include/uapi/linux/perf_event.h
-LIB_H += ../../include/linux/rbtree.h
-LIB_H += ../../include/linux/list.h
-LIB_H += ../../include/uapi/linux/const.h
-LIB_H += ../include/linux/hash.h
-LIB_H += ../../include/linux/stringify.h
-LIB_H += util/include/linux/bitmap.h
-LIB_H += ../include/linux/bitops.h
-LIB_H += ../include/asm-generic/bitops/arch_hweight.h
-LIB_H += ../include/asm-generic/bitops/atomic.h
-LIB_H += ../include/asm-generic/bitops/const_hweight.h
-LIB_H += ../include/asm-generic/bitops/find.h
-LIB_H += ../include/asm-generic/bitops/fls64.h
-LIB_H += ../include/asm-generic/bitops/fls.h
-LIB_H += ../include/asm-generic/bitops/__ffs.h
-LIB_H += ../include/asm-generic/bitops/__fls.h
-LIB_H += ../include/asm-generic/bitops/hweight.h
-LIB_H += ../include/asm-generic/bitops.h
-LIB_H += ../include/linux/compiler.h
-LIB_H += ../include/linux/log2.h
-LIB_H += util/include/linux/const.h
-LIB_H += util/include/linux/ctype.h
-LIB_H += util/include/linux/kernel.h
-LIB_H += util/include/linux/list.h
-LIB_H += ../include/linux/export.h
-LIB_H += util/include/linux/poison.h
-LIB_H += util/include/linux/rbtree.h
-LIB_H += util/include/linux/rbtree_augmented.h
-LIB_H += util/include/linux/string.h
-LIB_H += ../include/linux/types.h
-LIB_H += util/include/linux/linkage.h
-LIB_H += util/include/asm/asm-offsets.h
-LIB_H += ../include/asm/bug.h
-LIB_H += util/include/asm/byteorder.h
-LIB_H += util/include/asm/swab.h
-LIB_H += util/include/asm/system.h
-LIB_H += util/include/asm/uaccess.h
-LIB_H += util/include/dwarf-regs.h
-LIB_H += util/include/asm/dwarf2.h
-LIB_H += util/include/asm/cpufeature.h
-LIB_H += util/include/asm/unistd_32.h
-LIB_H += util/include/asm/unistd_64.h
-LIB_H += perf.h
-LIB_H += util/annotate.h
-LIB_H += util/cache.h
-LIB_H += util/callchain.h
-LIB_H += util/build-id.h
-LIB_H += util/db-export.h
-LIB_H += util/debug.h
-LIB_H += util/pmu.h
-LIB_H += util/event.h
-LIB_H += util/evsel.h
-LIB_H += util/evlist.h
-LIB_H += util/exec_cmd.h
-LIB_H += util/find-vdso-map.c
-LIB_H += util/levenshtein.h
-LIB_H += util/machine.h
-LIB_H += util/map.h
-LIB_H += util/parse-options.h
-LIB_H += util/parse-events.h
-LIB_H += util/quote.h
-LIB_H += util/util.h
-LIB_H += util/xyarray.h
-LIB_H += util/header.h
-LIB_H += util/help.h
-LIB_H += util/session.h
-LIB_H += util/ordered-events.h
-LIB_H += util/strbuf.h
-LIB_H += util/strlist.h
-LIB_H += util/strfilter.h
-LIB_H += util/svghelper.h
-LIB_H += util/tool.h
-LIB_H += util/run-command.h
-LIB_H += util/sigchain.h
-LIB_H += util/dso.h
-LIB_H += util/symbol.h
-LIB_H += util/color.h
-LIB_H += util/values.h
-LIB_H += util/sort.h
-LIB_H += util/hist.h
-LIB_H += util/comm.h
-LIB_H += util/thread.h
-LIB_H += util/thread_map.h
-LIB_H += util/trace-event.h
-LIB_H += util/probe-finder.h
-LIB_H += util/dwarf-aux.h
-LIB_H += util/probe-event.h
-LIB_H += util/pstack.h
-LIB_H += util/cpumap.h
-LIB_H += util/top.h
-LIB_H += $(ARCH_INCLUDE)
-LIB_H += util/cgroup.h
-LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h
-LIB_H += util/target.h
-LIB_H += util/rblist.h
-LIB_H += util/intlist.h
-LIB_H += util/perf_regs.h
-LIB_H += util/unwind.h
-LIB_H += util/vdso.h
-LIB_H += util/tsc.h
-LIB_H += ui/helpline.h
-LIB_H += ui/progress.h
-LIB_H += ui/util.h
-LIB_H += ui/ui.h
-LIB_H += util/data.h
-LIB_H += util/kvm-stat.h
-LIB_H += util/thread-stack.h
-
PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT)
# We choose to avoid "if .. else if .. else .. endif endif"
@@ -379,9 +266,8 @@ build := -f $(srctree)/tools/build/Makefile.build dir=. obj
$(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE
@$(MAKE) $(build)=perf
-$(OUTPUT)perf: $(BUILTIN_OBJS) $(PERFLIBS) $(PERF_IN)
- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \
- $(BUILTIN_OBJS) $(PERF_IN) $(LIBS) -o $@
+$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN)
+ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(PERF_IN) $(LIBS) -o $@
$(GTK_IN): FORCE
@$(MAKE) $(build)=gtk
@@ -462,15 +348,14 @@ $(OUTPUT)perf-read-vdsox32: perf-read-vdso.c util/find-vdso-map.c
$(QUIET_CC)$(CC) -mx32 $(filter -static,$(LDFLAGS)) -Wall -Werror -o $@ perf-read-vdso.c
endif
-$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
-$(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
+$(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h)
LIBPERF_IN := $(OUTPUT)libperf-in.o
$(LIBPERF_IN): FORCE
@$(MAKE) $(build)=libperf
-$(LIB_FILE): $(LIB_OBJS) $(LIBPERF_IN)
+$(LIB_FILE): $(LIBPERF_IN)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS)
# libtraceevent.a
@@ -655,7 +540,7 @@ config-clean:
@$(MAKE) -C config/feature-checks clean >/dev/null
clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean
- $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
+ $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
@find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
@$(RM) .config-detected
$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
--
1.9.3
next prev parent reply other threads:[~2015-02-13 20:51 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-13 20:48 [GIT PULL 00/43] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 01/43] tools build: Add new build support Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 02/43] tools build: Add detected config support Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 03/43] tools build: Add subdir support Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 04/43] perf tools: Remove api fs object from python build Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 05/43] perf build: Disable make's built-in rules Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 06/43] perf build: Add bench objects building Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 07/43] perf build: Add tests " Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 08/43] perf build: Add builtin " Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 09/43] perf build: Add libperf " Arnaldo Carvalho de Melo
2015-02-13 20:48 ` [PATCH 10/43] perf build: Add probe " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 11/43] perf build: Add dwarf " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 12/43] perf build: Add dwarf unwind " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 13/43] perf build: Add ui " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 14/43] perf build: Add slang " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 15/43] perf build: Add gtk " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 16/43] perf build: Add scripts " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 17/43] perf build: Add perf regs " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 18/43] perf build: Add zlib " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 19/43] perf build: Add perf.o object building Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 20/43] perf build: Add arch x86 objects building Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 21/43] perf build: Add arch arm " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 22/43] perf build: Add arch arm64 " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 23/43] perf build: Add arch powerpc " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 24/43] perf build: Add arch s390 " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 25/43] perf build: Add arch sh " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 26/43] perf build: Add arch sparc " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 27/43] perf build: Add single target build framework support Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 28/43] perf build: Remove directory dependency rules Arnaldo Carvalho de Melo
2015-02-13 20:49 ` Arnaldo Carvalho de Melo [this message]
2015-02-13 20:49 ` [PATCH 30/43] perf build: Remove PERF-CFLAGS file Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 31/43] perf build: Add build documentation Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 32/43] tools lib api: Use tools build framework Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 33/43] tools lib api: Rename libapikfs.a to libapi.a Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 34/43] tools lib traceevent: Use tools build framework Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 35/43] tools lib lockdep: " Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 36/43] perf build: Display make commands on V=1 Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 37/43] perf tools: Fix a bug of segmentation fault Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 38/43] perf: Remove the extra validity check on nr_pages Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 39/43] perf list: Place the header text in its right position Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 40/43] perf trace: Print thread info when following children Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 41/43] perf trace: Handle multiple threads better wrt syscalls being intermixed Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 42/43] perf trace: Allow mixing with other events Arnaldo Carvalho de Melo
2015-02-13 20:49 ` [PATCH 43/43] perf trace: Support --events foo:bar --no-syscalls Arnaldo Carvalho de Melo
2015-02-18 18:19 ` [GIT PULL 00/43] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423860572-24881-30-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=alexis.berlemont@gmail.com \
--cc=bp@alien8.de \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®