From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from emagii.se (www.emagii.com [185.133.207.17]) by sourceware.org (Postfix) with ESMTPS id 054553858C39 for ; Wed, 1 Mar 2023 17:31:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 054553858C39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=emagii.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=emagii.com Received: from valinor.ownit.se (84-55-68-216.customers.ownit.se [84.55.68.216]) by emagii.se (Postfix) with ESMTPSA id 3A3E0120194; Wed, 1 Mar 2023 18:30:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emagii.com; s=default; t=1677691860; bh=F+tCKpBXReWbPfToaFOi04plpYzPv6/8y/QyXmOM2BQ=; h=From:To:Subject; b=D1QSDkbx5RF6PCrD803RLgLFOk9g8MjqwOadeMWbnV06MAuE4Dg6q6kVeurtTQ/jI 9bggFPV1iYhBDglwJPlNrIK8U7odetDAlt3GEWPZZiCEu5QszFhLu9v0vQH40UCO3V tZy+4ZrI0AYx69ndDcX3krQdqqaLU48B6QSIXKpo= Authentication-Results: emagii.beebytevps.io; spf=pass (sender IP is 84.55.68.216) smtp.mailfrom=binutils@emagii.com smtp.helo=valinor.ownit.se Received-SPF: pass (emagii.beebytevps.io: connection is authenticated) From: binutils@emagii.com To: binutils@sourceware.org Cc: nickc@redhat.com, Ulf Samuelsson Subject: [PATCH v7 11/11] Build ldint Date: Wed, 1 Mar 2023 18:30:22 +0100 Message-Id: <20230301173022.1851188-11-binutils@emagii.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230301173022.1851188-8-binutils@emagii.com> References: <20230301173022.1851188-8-binutils@emagii.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-PPP-Message-ID: <167769185942.160938.8929784582862969715@localhost.localdomain> X-PPP-Vhost: emagii.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_FAIL,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Ulf Samuelsson Signed-off-by: Ulf Samuelsson --- ld/Makefile.am | 16 +++++++++++++-- ld/Makefile.in | 53 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am index 813f19b354a..00118f8da13 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -128,7 +128,7 @@ CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=[^ ]*//g'` transform = s/^ld-new$$/$(installed_linker)/;@program_transform_name@ bin_PROGRAMS = ld-new -info_TEXINFOS = ld.texi +info_TEXINFOS = ld.texi ldint.texi ld_TEXINFOS = configdoc.texi noinst_TEXINFOS = ldint.texi man_MANS = ld.1 @@ -1060,7 +1060,19 @@ ld.1: $(srcdir)/ld.texi configdoc.texi (rm -f $@.T$$$$ && exit 1) $(AM_V_at)rm -f ld.pod -MAINTAINERCLEANFILES = configdoc.texi ld.1 +# Build the man page from the texinfo file +# The sed command removes the no-adjust Nroff command so that +# the man output looks standard. +ldint.1: $(srcdir)/ldint.texi configdoc.texi + $(AM_V_GEN)touch $@ + $(AM_V_at)-$(TEXI2POD) $(MANCONF) < $(srcdir)/ldint.texi > ldint.pod + $(AM_V_at)-($(POD2MAN) ldint.pod | \ + sed -e '/^.if n .na/d' > $@.T$$$$ && \ + mv -f $@.T$$$$ $@) || \ + (rm -f $@.T$$$$ && exit 1) + $(AM_V_at)rm -f ldint.pod + +MAINTAINERCLEANFILES = configdoc.texi ld.1 ldint.1 # We want to reconfigure if configure.host or configure.tgt changes. # development.sh is used to determine -Werror default. diff --git a/ld/Makefile.in b/ld/Makefile.in index 6ec916aa629..7bf51bffa54 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -305,11 +305,11 @@ am__v_texidevnull_0 = > /dev/null am__v_texidevnull_1 = INFO_DEPS = ld.info am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo -DVIS = ld.dvi -PDFS = ld.pdf -PSS = ld.ps -HTMLS = ld.html -TEXINFOS = ld.texi +DVIS = ld.dvi ldint.dvi +PDFS = ld.pdf ldint.pdf +PSS = ld.ps ldint.ps +HTMLS = ld.html ldint.html +TEXINFOS = ld.texi ldint.texi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) @@ -1682,18 +1682,48 @@ ld.info: ld.texi $(ld_TEXINFOS) fi; \ rm -rf $$backupdir; exit $$rc +ldint.info: ld.texi $(ld_TEXINFOS) + $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + 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 && \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $@ `test -f 'ldint.texi' || echo '$(srcdir)/'`ldint.texi; \ + then \ + rc=0; \ + else \ + rc=$$?; \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ + fi; \ + rm -rf $$backupdir; exit $$rc + ld.dvi: ld.texi $(ld_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 'ld.texi' || echo '$(srcdir)/'`ld.texi -ld.pdf: ld.texi $(ld_TEXINFOS) +ldint.dvi: ldint.texi $(ld_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 'ldint.texi' || echo '$(srcdir)/'`ldint.texi + +ld.pdf: ld.texi $(ld_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 'ld.texi' || echo '$(srcdir)/'`ld.texi +ldint.pdf: ldint.texi $(ld_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 'ldint.texi' || echo '$(srcdir)/'`ldint.texi + ld.html: ld.texi $(ld_TEXINFOS) $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ @@ -1703,6 +1733,17 @@ ld.html: ld.texi $(ld_TEXINFOS) else \ rm -rf $(@:.html=.htp); exit 1; \ fi + +ldint.html: ldint.texi $(ld_TEXINFOS) + $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) + $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $(@:.html=.htp) `test -f 'ldint.texi' || echo '$(srcdir)/'`ldint.texi; \ + then \ + rm -rf $@ && mv $(@:.html=.htp) $@; \ + else \ + rm -rf $(@:.html=.htp); exit 1; \ + fi + .dvi.ps: $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) $(AM_V_texinfo) -o $@ $< -- 2.34.1