All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files
@ 2012-10-26  8:55 Namhyung Kim
  2012-10-26  8:55 ` [PATCH 2/5] perf tools: Cleanup doc related targets Namhyung Kim
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Namhyung Kim @ 2012-10-26  8:55 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, LKML, Steven Rostedt,
	Borislav Petkov

Ingo reported (again!) that 'make clean' on perf/traceevent does not
work due to some reason with system header file. Quotes Ingo:

 "Note that the old dependency related build failure thought to be
  fixed in commit 860df5833e46 is back:

   make[1]: *** No rule to make target
   `/usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/stddef.h', needed by `.trace-seq.d'.  Stop.

  'make clean' itself does not work in libtraceevent:

   comet:~/tip/tools/lib/traceevent> make clean
   make: *** No rule to make target `/usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/stddef.h', needed by `.trace-seq.d'.  Stop.

  So I had to clean it out manually:

   comet:~/tip/tools/lib/traceevent> git ls-files --others | xargs rm
   comet:~/tip/tools/lib/traceevent>

  and then things build fine."

Try to fix it by excluding system headers from dependency generation.

Reported-by: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Borislav Petkov <bp@amd64.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/lib/traceevent/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 04d959fa0226..a20e32033431 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -253,7 +253,7 @@ all_deps := $(all_objs:%.o=.%.d)
 # let .d file also depends on the source and header files
 define check_deps
 		@set -e; $(RM) $@; \
-		$(CC) -M $(CFLAGS) $< > $@.$$$$; \
+		$(CC) -MM $(CFLAGS) $< > $@.$$$$; \
 		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 		$(RM) $@.$$$$
 endef
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 2/5] perf tools: Cleanup doc related targets
  2012-10-26  8:55 [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
@ 2012-10-26  8:55 ` Namhyung Kim
  2012-10-26 15:05   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-10-26  8:55 ` [PATCH 3/5] perf tools: Convert invocation of MAKE into SUBDIR Namhyung Kim
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-10-26  8:55 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, LKML, Namhyung Kim,
	Borislav Petkov

From: Namhyung Kim <namhyung.kim@lge.com>

Documentation targets handling rules are duplicate.  Consolidate them
with DOC_TARGETS and INSTALL_DOC_TARGETS.

Cc: Borislav Petkov <bp@amd64.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/Makefile | 46 +++++++++-------------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b14eeb86d8d7..5cf40cbdaaf9 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -977,20 +977,15 @@ help:
 	@echo 'Perf maintainer targets:'
 	@echo '  clean			- clean all binary objects and build output'
 
-doc:
-	$(MAKE) -C Documentation all
 
-man:
-	$(MAKE) -C Documentation man
+DOC_TARGETS := doc man html info pdf
 
-html:
-	$(MAKE) -C Documentation html
+INSTALL_DOC_TARGETS := $(patsubst %,install-%,$(DOC_TARGETS)) try-install-man
+INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html
 
-info:
-	$(MAKE) -C Documentation info
-
-pdf:
-	$(MAKE) -C Documentation pdf
+# 'make doc' should call 'make -C Documentation all'
+$(DOC_TARGETS):
+	$(MAKE) -C Documentation $(@:doc=all)
 
 TAGS:
 	$(RM) TAGS
@@ -1061,32 +1056,9 @@ install: all try-install-man
 install-python_ext:
 	$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
 
-install-doc:
-	$(MAKE) -C Documentation install
-
-install-man:
-	$(MAKE) -C Documentation install-man
-
-try-install-man:
-	$(MAKE) -C Documentation try-install-man
-
-install-html:
-	$(MAKE) -C Documentation install-html
-
-install-info:
-	$(MAKE) -C Documentation install-info
-
-install-pdf:
-	$(MAKE) -C Documentation install-pdf
-
-quick-install-doc:
-	$(MAKE) -C Documentation quick-install
-
-quick-install-man:
-	$(MAKE) -C Documentation quick-install-man
-
-quick-install-html:
-	$(MAKE) -C Documentation quick-install-html
+# 'make install-doc' should call 'make -C Documentation install'
+$(INSTALL_DOC_TARGETS):
+	$(MAKE) -C Documentation $(@:-doc=)
 
 ### Cleaning rules
 
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 3/5] perf tools: Convert invocation of MAKE into SUBDIR
  2012-10-26  8:55 [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
  2012-10-26  8:55 ` [PATCH 2/5] perf tools: Cleanup doc related targets Namhyung Kim
@ 2012-10-26  8:55 ` Namhyung Kim
  2012-10-26 15:06   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-10-26  8:55 ` [PATCH 4/5] perf tools: Always show CHK message when doing try-cc Namhyung Kim
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-10-26  8:55 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, LKML, Namhyung Kim,
	Borislav Petkov, David Howells

From: Namhyung Kim <namhyung.kim@lge.com>

This will show directory change info in a consistent form.  Also it
can be converted again into David Howell's descend command.

Cc: Borislav Petkov <bp@amd64.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5cf40cbdaaf9..2d0c09ab58b8 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -985,7 +985,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html
 
 # 'make doc' should call 'make -C Documentation all'
 $(DOC_TARGETS):
-	$(MAKE) -C Documentation $(@:doc=all)
+	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all)
 
 TAGS:
 	$(RM) TAGS
@@ -1058,7 +1058,7 @@ install-python_ext:
 
 # 'make install-doc' should call 'make -C Documentation install'
 $(INSTALL_DOC_TARGETS):
-	$(MAKE) -C Documentation $(@:-doc=)
+	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=)
 
 ### Cleaning rules
 
@@ -1066,7 +1066,7 @@ clean: $(LIBTRACEEVENT)-clean
 	$(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS)
 	$(RM) $(ALL_PROGRAMS) perf
 	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*
-	$(MAKE) -C Documentation/ clean
+	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
 	$(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS
 	$(RM) $(OUTPUT)util/*-bison*
 	$(RM) $(OUTPUT)util/*-flex*
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 4/5] perf tools: Always show CHK message when doing try-cc
  2012-10-26  8:55 [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
  2012-10-26  8:55 ` [PATCH 2/5] perf tools: Cleanup doc related targets Namhyung Kim
  2012-10-26  8:55 ` [PATCH 3/5] perf tools: Convert invocation of MAKE into SUBDIR Namhyung Kim
@ 2012-10-26  8:55 ` Namhyung Kim
  2012-10-26 12:48   ` Arnaldo Carvalho de Melo
                     ` (2 more replies)
  2012-10-26  8:55 ` [PATCH 5/5] perf tools: Fix LIBELF_MMAP checking Namhyung Kim
  2012-10-26 15:04 ` [tip:perf/core] tools lib traceevent: Do not generate dependency for system header files tip-bot for Namhyung Kim
  4 siblings, 3 replies; 12+ messages in thread
From: Namhyung Kim @ 2012-10-26  8:55 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, LKML, Namhyung Kim,
	Jiri Olsa, Borislav Petkov

From: Namhyung Kim <namhyung.kim@lge.com>

It might be useful to see what's happening behind us rather than just
waiting few seconds during the config checking.

Also align the CHK message with other ones.

Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@amd64.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/config/utilities.mak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/perf/config/utilities.mak b/tools/perf/config/utilities.mak
index ea853c279b31..e5413125e6bb 100644
--- a/tools/perf/config/utilities.mak
+++ b/tools/perf/config/utilities.mak
@@ -183,9 +183,8 @@ _gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))
 # Usage: option = $(call try-cc, source-to-build, cc-options, msg)
 ifndef V
 TRY_CC_OUTPUT= > /dev/null 2>&1
-else
-TRY_CC_MSG=echo "CHK $(3)" 1>&2;
 endif
+TRY_CC_MSG=echo "    CHK $(3)" 1>&2;
 
 try-cc = $(shell sh -c						  \
 	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 5/5] perf tools: Fix LIBELF_MMAP checking
  2012-10-26  8:55 [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
                   ` (2 preceding siblings ...)
  2012-10-26  8:55 ` [PATCH 4/5] perf tools: Always show CHK message when doing try-cc Namhyung Kim
@ 2012-10-26  8:55 ` Namhyung Kim
  2012-10-26 15:08   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-10-26 15:04 ` [tip:perf/core] tools lib traceevent: Do not generate dependency for system header files tip-bot for Namhyung Kim
  4 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-10-26  8:55 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, LKML, Namhyung Kim,
	Jiri Olsa, Borislav Petkov

From: Namhyung Kim <namhyung.kim@lge.com>

Currently checking mmap support in libelf failed due to wrong flags.

    CHK libelf
    CHK libdw
    CHK libunwind
    CHK -DLIBELF_MMAP
/tmp/ccYJwdR0.o: In function `main':
:(.text+0x18): undefined reference to `elf_begin'
collect2: error: ld returned 1 exit status

This cannot happen since we checked the elf_begin() when checking
libelf and it succeeded.

Fix it by using a same flag with libelf checking.

Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@amd64.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 2d0c09ab58b8..629fc6a4b0df 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -541,7 +541,8 @@ LIB_OBJS += $(OUTPUT)util/symbol-minimal.o
 else # NO_LIBELF
 BASIC_CFLAGS += -DLIBELF_SUPPORT
 
-ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON),-DLIBELF_MMAP),y)
+FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS)
+ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
 	BASIC_CFLAGS += -DLIBELF_MMAP
 endif
 
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] perf tools: Always show CHK message when doing try-cc
  2012-10-26  8:55 ` [PATCH 4/5] perf tools: Always show CHK message when doing try-cc Namhyung Kim
@ 2012-10-26 12:48   ` Arnaldo Carvalho de Melo
  2012-10-26 13:00   ` Jiri Olsa
  2012-10-26 15:07   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2 siblings, 0 replies; 12+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-10-26 12:48 UTC (permalink / raw)
  To: Namhyung Kim
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, LKML, Namhyung Kim,
	Jiri Olsa, Borislav Petkov

Em Fri, Oct 26, 2012 at 05:55:51PM +0900, Namhyung Kim escreveu:
> From: Namhyung Kim <namhyung.kim@lge.com>
> 
> It might be useful to see what's happening behind us rather than just
> waiting few seconds during the config checking.

Which shows that we're calling it even for Documentation! :-\ Would be
good to have just one set of feature checks made...

- Arnaldo

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] perf tools: Always show CHK message when doing try-cc
  2012-10-26  8:55 ` [PATCH 4/5] perf tools: Always show CHK message when doing try-cc Namhyung Kim
  2012-10-26 12:48   ` Arnaldo Carvalho de Melo
@ 2012-10-26 13:00   ` Jiri Olsa
  2012-10-26 15:07   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2 siblings, 0 replies; 12+ messages in thread
From: Jiri Olsa @ 2012-10-26 13:00 UTC (permalink / raw)
  To: Namhyung Kim
  Cc: Arnaldo Carvalho de Melo, Peter Zijlstra, Paul Mackerras,
	Ingo Molnar, LKML, Namhyung Kim, Borislav Petkov

On Fri, Oct 26, 2012 at 05:55:51PM +0900, Namhyung Kim wrote:
> From: Namhyung Kim <namhyung.kim@lge.com>
> 
> It might be useful to see what's happening behind us rather than just
> waiting few seconds during the config checking.

Do we want to see all that within just simple 'make'
also in case nothing gets rebuilt? It seems noisy..


[jolsa@krava perf]$ make
    CHK -fstack-protector-all
    CHK -Wstack-protector
    CHK -Wvolatile-register-var
    CHK bionic
    CHK libelf
    CHK libdw
    CHK libunwind
    CHK -DLIBELF_MMAP
    CHK libaudit
    CHK libnewt
    CHK gtk2
Makefile:608: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev
    CHK perl
    CHK python
    CHK python version
    CHK libbfd
    CHK -DHAVE_STRLCPY
    CHK -DHAVE_ON_EXIT
    CHK -DBACKTRACE_SUPPORT
    SUBDIR ../lib/traceevent/
    LINK perf

hum, also not sure why's there ^^^ the final LINK for no change rebuild..

jirka

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [tip:perf/core] tools lib traceevent: Do not generate dependency for system header files
  2012-10-26  8:55 [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
                   ` (3 preceding siblings ...)
  2012-10-26  8:55 ` [PATCH 5/5] perf tools: Fix LIBELF_MMAP checking Namhyung Kim
@ 2012-10-26 15:04 ` tip-bot for Namhyung Kim
  4 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-10-26 15:04 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra, bp,
	namhyung, rostedt, tglx

Commit-ID:  b6f4f804108bd563070ab95199cbddcf7650cbf4
Gitweb:     http://git.kernel.org/tip/b6f4f804108bd563070ab95199cbddcf7650cbf4
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Fri, 26 Oct 2012 17:55:48 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 26 Oct 2012 11:22:23 -0200

tools lib traceevent: Do not generate dependency for system header files

Ingo reported (again!) that 'make clean' on perf/traceevent does not
work due to some reason with system header file. Quotes Ingo:

 "Note that the old dependency related build failure thought to be
  fixed in commit 860df5833e46 is back:

   make[1]: *** No rule to make target
   `/usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/stddef.h', needed by `.trace-seq.d'.  Stop.

  'make clean' itself does not work in libtraceevent:

   comet:~/tip/tools/lib/traceevent> make clean
   make: *** No rule to make target `/usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/stddef.h', needed by `.trace-seq.d'.  Stop.

  So I had to clean it out manually:

   comet:~/tip/tools/lib/traceevent> git ls-files --others | xargs rm
   comet:~/tip/tools/lib/traceevent>

  and then things build fine."

Try to fix it by excluding system headers from dependency generation.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reported-by: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@amd64.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1351241752-2919-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 04d959f..a20e320 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -253,7 +253,7 @@ all_deps := $(all_objs:%.o=.%.d)
 # let .d file also depends on the source and header files
 define check_deps
 		@set -e; $(RM) $@; \
-		$(CC) -M $(CFLAGS) $< > $@.$$$$; \
+		$(CC) -MM $(CFLAGS) $< > $@.$$$$; \
 		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 		$(RM) $@.$$$$
 endef

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf tools: Cleanup doc related targets
  2012-10-26  8:55 ` [PATCH 2/5] perf tools: Cleanup doc related targets Namhyung Kim
@ 2012-10-26 15:05   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-10-26 15:05 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, bp, namhyung, tglx

Commit-ID:  536e2b0fc2af42a464ea6eb6b67a2c754e14f2e2
Gitweb:     http://git.kernel.org/tip/536e2b0fc2af42a464ea6eb6b67a2c754e14f2e2
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Fri, 26 Oct 2012 17:55:49 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 26 Oct 2012 11:22:24 -0200

perf tools: Cleanup doc related targets

Documentation targets handling rules are duplicate.  Consolidate them
with DOC_TARGETS and INSTALL_DOC_TARGETS.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Borislav Petkov <bp@amd64.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1351241752-2919-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile |   46 +++++++++-------------------------------------
 1 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b14eeb8..5cf40cb 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -977,20 +977,15 @@ help:
 	@echo 'Perf maintainer targets:'
 	@echo '  clean			- clean all binary objects and build output'
 
-doc:
-	$(MAKE) -C Documentation all
 
-man:
-	$(MAKE) -C Documentation man
+DOC_TARGETS := doc man html info pdf
 
-html:
-	$(MAKE) -C Documentation html
+INSTALL_DOC_TARGETS := $(patsubst %,install-%,$(DOC_TARGETS)) try-install-man
+INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html
 
-info:
-	$(MAKE) -C Documentation info
-
-pdf:
-	$(MAKE) -C Documentation pdf
+# 'make doc' should call 'make -C Documentation all'
+$(DOC_TARGETS):
+	$(MAKE) -C Documentation $(@:doc=all)
 
 TAGS:
 	$(RM) TAGS
@@ -1061,32 +1056,9 @@ install: all try-install-man
 install-python_ext:
 	$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
 
-install-doc:
-	$(MAKE) -C Documentation install
-
-install-man:
-	$(MAKE) -C Documentation install-man
-
-try-install-man:
-	$(MAKE) -C Documentation try-install-man
-
-install-html:
-	$(MAKE) -C Documentation install-html
-
-install-info:
-	$(MAKE) -C Documentation install-info
-
-install-pdf:
-	$(MAKE) -C Documentation install-pdf
-
-quick-install-doc:
-	$(MAKE) -C Documentation quick-install
-
-quick-install-man:
-	$(MAKE) -C Documentation quick-install-man
-
-quick-install-html:
-	$(MAKE) -C Documentation quick-install-html
+# 'make install-doc' should call 'make -C Documentation install'
+$(INSTALL_DOC_TARGETS):
+	$(MAKE) -C Documentation $(@:-doc=)
 
 ### Cleaning rules
 

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf tools: Convert invocation of MAKE into SUBDIR
  2012-10-26  8:55 ` [PATCH 3/5] perf tools: Convert invocation of MAKE into SUBDIR Namhyung Kim
@ 2012-10-26 15:06   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-10-26 15:06 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, bp, namhyung, dhowells, tglx

Commit-ID:  615d774d69031357a1bfed57fd383c6fe6f90a69
Gitweb:     http://git.kernel.org/tip/615d774d69031357a1bfed57fd383c6fe6f90a69
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Fri, 26 Oct 2012 17:55:50 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 26 Oct 2012 11:22:24 -0200

perf tools: Convert invocation of MAKE into SUBDIR

This will show directory change info in a consistent form.  Also it can
be converted again into David Howell's descend command.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Borislav Petkov <bp@amd64.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1351241752-2919-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5cf40cb..2d0c09a 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -985,7 +985,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html
 
 # 'make doc' should call 'make -C Documentation all'
 $(DOC_TARGETS):
-	$(MAKE) -C Documentation $(@:doc=all)
+	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all)
 
 TAGS:
 	$(RM) TAGS
@@ -1058,7 +1058,7 @@ install-python_ext:
 
 # 'make install-doc' should call 'make -C Documentation install'
 $(INSTALL_DOC_TARGETS):
-	$(MAKE) -C Documentation $(@:-doc=)
+	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=)
 
 ### Cleaning rules
 
@@ -1066,7 +1066,7 @@ clean: $(LIBTRACEEVENT)-clean
 	$(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS)
 	$(RM) $(ALL_PROGRAMS) perf
 	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*
-	$(MAKE) -C Documentation/ clean
+	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
 	$(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS
 	$(RM) $(OUTPUT)util/*-bison*
 	$(RM) $(OUTPUT)util/*-flex*

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf tools: Always show CHK message when doing try-cc
  2012-10-26  8:55 ` [PATCH 4/5] perf tools: Always show CHK message when doing try-cc Namhyung Kim
  2012-10-26 12:48   ` Arnaldo Carvalho de Melo
  2012-10-26 13:00   ` Jiri Olsa
@ 2012-10-26 15:07   ` tip-bot for Namhyung Kim
  2 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-10-26 15:07 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, bp, namhyung, jolsa, tglx

Commit-ID:  cf3aa103555136c04894058152b129c133ebf350
Gitweb:     http://git.kernel.org/tip/cf3aa103555136c04894058152b129c133ebf350
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Fri, 26 Oct 2012 17:55:51 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 26 Oct 2012 11:22:24 -0200

perf tools: Always show CHK message when doing try-cc

It might be useful to see what's happening behind us rather than just
waiting few seconds during the config checking.

Also align the CHK message with other ones.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Borislav Petkov <bp@amd64.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1351241752-2919-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/config/utilities.mak |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/tools/perf/config/utilities.mak b/tools/perf/config/utilities.mak
index ea853c2..e541312 100644
--- a/tools/perf/config/utilities.mak
+++ b/tools/perf/config/utilities.mak
@@ -183,9 +183,8 @@ _gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))
 # Usage: option = $(call try-cc, source-to-build, cc-options, msg)
 ifndef V
 TRY_CC_OUTPUT= > /dev/null 2>&1
-else
-TRY_CC_MSG=echo "CHK $(3)" 1>&2;
 endif
+TRY_CC_MSG=echo "    CHK $(3)" 1>&2;
 
 try-cc = $(shell sh -c						  \
 	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf tools: Fix LIBELF_MMAP checking
  2012-10-26  8:55 ` [PATCH 5/5] perf tools: Fix LIBELF_MMAP checking Namhyung Kim
@ 2012-10-26 15:08   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-10-26 15:08 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, bp, namhyung, jolsa, tglx

Commit-ID:  fcc328032e7382bf413517ee4dddf1eca7970fe4
Gitweb:     http://git.kernel.org/tip/fcc328032e7382bf413517ee4dddf1eca7970fe4
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Fri, 26 Oct 2012 17:55:52 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 26 Oct 2012 11:22:24 -0200

perf tools: Fix LIBELF_MMAP checking

Currently checking mmap support in libelf failed due to wrong flags.

    CHK libelf
    CHK libdw
    CHK libunwind
    CHK -DLIBELF_MMAP
/tmp/ccYJwdR0.o: In function `main':
:(.text+0x18): undefined reference to `elf_begin'
collect2: error: ld returned 1 exit status

This cannot happen since we checked the elf_begin() when checking
libelf and it succeeded.

Fix it by using a same flag with libelf checking.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Borislav Petkov <bp@amd64.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1351241752-2919-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 2d0c09a..629fc6a 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -541,7 +541,8 @@ LIB_OBJS += $(OUTPUT)util/symbol-minimal.o
 else # NO_LIBELF
 BASIC_CFLAGS += -DLIBELF_SUPPORT
 
-ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON),-DLIBELF_MMAP),y)
+FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS)
+ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
 	BASIC_CFLAGS += -DLIBELF_MMAP
 endif
 

^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-10-26 16:06 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-26  8:55 [PATCH RESEND 1/5] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
2012-10-26  8:55 ` [PATCH 2/5] perf tools: Cleanup doc related targets Namhyung Kim
2012-10-26 15:05   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-10-26  8:55 ` [PATCH 3/5] perf tools: Convert invocation of MAKE into SUBDIR Namhyung Kim
2012-10-26 15:06   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-10-26  8:55 ` [PATCH 4/5] perf tools: Always show CHK message when doing try-cc Namhyung Kim
2012-10-26 12:48   ` Arnaldo Carvalho de Melo
2012-10-26 13:00   ` Jiri Olsa
2012-10-26 15:07   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-10-26  8:55 ` [PATCH 5/5] perf tools: Fix LIBELF_MMAP checking Namhyung Kim
2012-10-26 15:08   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-10-26 15:04 ` [tip:perf/core] tools lib traceevent: Do not generate dependency for system header files tip-bot for Namhyung Kim

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.