From: Ruud van der Pas <ruud.vanderpas@oracle.com>
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: Binutils <binutils@sourceware.org>
Subject: Re: [PATCH] gprofng: Don't generate gprofng.info in source
Date: Tue, 15 Mar 2022 18:06:25 +0100 [thread overview]
Message-ID: <9B821029-D1BD-48C1-AB2A-C7D8EDF0BCDE@oracle.com> (raw)
In-Reply-To: <CAMe9rOo4P2zAEAkWMb3gF5W6sZODZm+FQWUnfeDipcY3VicmeQ@mail.gmail.com>
Hi H.J.,
Looks good. Thanks!
Kind regards, Ruud
> On 15 Mar 2022, at 15:27, H.J. Lu via Binutils <binutils@sourceware.org> wrote:
>
> On Mon, Mar 14, 2022 at 5:39 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>>
>> Add info-in-builddir to AUTOMAKE_OPTIONS.
>>
>> PR gprof/28967
>> * doc/Makefile.am (AUTOMAKE_OPTIONS): Add info-in-builddir.
>> * doc/Makefile.in: Regenerate.
>> ---
>> gprofng/doc/Makefile.am | 2 +-
>> gprofng/doc/Makefile.in | 30 +++++++++++-------------------
>> 2 files changed, 12 insertions(+), 20 deletions(-)
>>
>> diff --git a/gprofng/doc/Makefile.am b/gprofng/doc/Makefile.am
>> index 3dc2caca423..151e65a77e8 100644
>> --- a/gprofng/doc/Makefile.am
>> +++ b/gprofng/doc/Makefile.am
>> @@ -17,7 +17,7 @@
>> # <http://www.gnu.org/licenses/>.
>> #
>>
>> -AUTOMAKE_OPTIONS = foreign no-texinfo.tex
>> +AUTOMAKE_OPTIONS = info-in-builddir foreign no-texinfo.tex
>>
>> info_TEXINFOS = gprofng.texi
>> gprofng_TEXINFOS = fdl.texi
>> diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
>> index 31e298c3cf8..b45d6888f76 100644
>> --- a/gprofng/doc/Makefile.in
>> +++ b/gprofng/doc/Makefile.in
>> @@ -165,7 +165,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
>> am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
>> am__v_texidevnull_0 = > /dev/null
>> am__v_texidevnull_1 =
>> -INFO_DEPS = $(srcdir)/gprofng.info
>> +INFO_DEPS = gprofng.info
>> am__TEXINFO_TEX_DIR = $(srcdir)/.
>> DVIS = gprofng.dvi
>> PDFS = gprofng.pdf
>> @@ -349,7 +349,7 @@ target_alias = @target_alias@
>> top_build_prefix = @top_build_prefix@
>> top_builddir = @top_builddir@
>> top_srcdir = @top_srcdir@
>> -AUTOMAKE_OPTIONS = foreign no-texinfo.tex
>> +AUTOMAKE_OPTIONS = info-in-builddir foreign no-texinfo.tex
>> info_TEXINFOS = gprofng.texi
>> gprofng_TEXINFOS = fdl.texi
>> BUILT_SOURCES = version.texi
>> @@ -363,7 +363,7 @@ all: $(BUILT_SOURCES)
>> $(MAKE) $(AM_MAKEFLAGS) all-am
>>
>> .SUFFIXES:
>> -.SUFFIXES: .dvi .html .info .pdf .ps .texi
>> +.SUFFIXES: .dvi .ps
>> $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
>> @for dep in $?; do \
>> case '$(am__configure_deps)' in \
>> @@ -400,53 +400,45 @@ mostlyclean-libtool:
>> clean-libtool:
>> -rm -rf .libs _libs
>>
>> -.texi.info:
>> +gprofng.info: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
>> - am__cwd=`pwd` && $(am__cd) $(srcdir) && \
>> rm -rf $$backupdir && mkdir $$backupdir && \
>> if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
>> for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
>> if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
>> done; \
>> else :; fi && \
>> - cd "$$am__cwd"; \
>> if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
>> - -o $@ $<; \
>> + -o $@ `test -f 'gprofng.texi' || echo '$(srcdir)/'`gprofng.texi; \
>> then \
>> rc=0; \
>> - $(am__cd) $(srcdir); \
>> else \
>> rc=$$?; \
>> - $(am__cd) $(srcdir) && \
>> $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
>> fi; \
>> rm -rf $$backupdir; exit $$rc
>>
>> -.texi.dvi:
>> +gprofng.dvi: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
>> MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
>> $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
>> - $<
>> + `test -f 'gprofng.texi' || echo '$(srcdir)/'`gprofng.texi
>>
>> -.texi.pdf:
>> +gprofng.pdf: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
>> MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
>> $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
>> - $<
>> + `test -f 'gprofng.texi' || echo '$(srcdir)/'`gprofng.texi
>>
>> -.texi.html:
>> +gprofng.html: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
>> $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
>> - -o $(@:.html=.htp) $<; \
>> + -o $(@:.html=.htp) `test -f 'gprofng.texi' || echo '$(srcdir)/'`gprofng.texi; \
>> then \
>> rm -rf $@ && mv $(@:.html=.htp) $@; \
>> else \
>> rm -rf $(@:.html=.htp); exit 1; \
>> fi
>> -$(srcdir)/gprofng.info: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> -gprofng.dvi: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> -gprofng.pdf: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> -gprofng.html: gprofng.texi $(srcdir)/version.texi $(gprofng_TEXINFOS)
>> $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
>> $(srcdir)/stamp-vti: gprofng.texi $(top_srcdir)/configure
>> @(dir=.; test -f ./gprofng.texi || dir=$(srcdir); \
>> --
>> 2.35.1
>>
>
> I am checking it in.
>
> --
> H.J.
prev parent reply other threads:[~2022-03-15 17:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 0:39 H.J. Lu
2022-03-15 14:27 ` H.J. Lu
2022-03-15 17:06 ` Ruud van der Pas [this message]
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=9B821029-D1BD-48C1-AB2A-C7D8EDF0BCDE@oracle.com \
--to=ruud.vanderpas@oracle.com \
--cc=binutils@sourceware.org \
--cc=hjl.tools@gmail.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).