[PING²] PR external/{16327,16328}: Remove etc/configure.texi and etc/standards.texi
Commit Message
Initial submission at:
http://sourceware.org/ml/gdb-patches/2014-05/msg00044.html
This patch removes etc/{configure,standards}.texi, for the reasons given at:
http://sourceware.org/bugzilla/show_bug.cgi?id=16327
http://sourceware.org/bugzilla/show_bug.cgi?id=16328
Namely, the first problem addressed is that standards.texi is maintained
elsewhere and has no reason to be installed alongside Binutils or GDB.
Second, configure.texi is partly outdated, partly redundant with
standards.texi, and would belong in Autoconf more than in GDB/Binutils.
(I left out the diffs for file removals from this message.)
WDYT?
Thanks,
Ludo’.
etc/ChangeLog
2014-06-26 Ludovic Courtès <ludo@gnu.org>
PR external/16327
PR external/16328
* Makefile.in (MAKEINFO, TEXI2DVI, TEXI2PDF, TEXI2HTML, DVIPS,
TEXIDIR, INFOFILES, DVIFILES, PDFFILES, HTMLFILES): Remove.
(all): Remove dependency on 'info'.
(install): Remove dependency on 'install-info'.
(standards.info, standards.html, standards.dvi, standards.ps)
standards.pdf, configure.info, configure.dvi, configure.ps,
configure.pdf, configure.pdf): Remove.
(info, install-info, html, install-html, dvi, pdf, install-pdf)
clean, maintainer-clean, realclean): Remove body.
* etc/configbuild.ein, etc/configbuild.fig, etc/configbuild.jin,
etc/configbuild.tin, etc/configdev.ein, etc/configdev.fig,
etc/configdev.jin, etc/configdev.tin, etc/configure.texi,
etc/fdl.texi, etc/gnu-oids.texi, etc/make-stds.texi,
etc/standards.texi: Remove.
---
etc/Makefile.in | 182 +--
etc/configbuild.ein | 149 --
etc/configbuild.fig | 50 -
etc/configbuild.jin | Bin 11123 -> 0 bytes
etc/configbuild.tin | 9 -
etc/configdev.ein | 185 ---
etc/configdev.fig | 80 -
etc/configdev.jin | Bin 17967 -> 0 bytes
etc/configdev.tin | 17 -
etc/configure.texi | 2646 --------------------------------
etc/fdl.texi | 505 ------
etc/gnu-oids.texi | 52 -
etc/make-stds.texi | 1135 --------------
etc/standards.texi | 4235 ---------------------------------------------------
14 files changed, 4 insertions(+), 9241 deletions(-)
delete mode 100644 etc/configbuild.ein
delete mode 100644 etc/configbuild.fig
delete mode 100644 etc/configbuild.jin
delete mode 100644 etc/configbuild.tin
delete mode 100644 etc/configdev.ein
delete mode 100644 etc/configdev.fig
delete mode 100644 etc/configdev.jin
delete mode 100644 etc/configdev.tin
delete mode 100644 etc/configure.texi
delete mode 100644 etc/fdl.texi
delete mode 100644 etc/gnu-oids.texi
delete mode 100644 etc/make-stds.texi
delete mode 100644 etc/standards.texi
Comments
On Thu, Jun 26, 2014 at 02:57:23PM +0200, Ludovic Courtès wrote:
> etc/ChangeLog
> 2014-06-26 Ludovic Courtès <ludo@gnu.org>
>
> PR external/16327
> PR external/16328
> * Makefile.in (MAKEINFO, TEXI2DVI, TEXI2PDF, TEXI2HTML, DVIPS,
> TEXIDIR, INFOFILES, DVIFILES, PDFFILES, HTMLFILES): Remove.
> (all): Remove dependency on 'info'.
> (install): Remove dependency on 'install-info'.
> (standards.info, standards.html, standards.dvi, standards.ps)
> standards.pdf, configure.info, configure.dvi, configure.ps,
> configure.pdf, configure.pdf): Remove.
> (info, install-info, html, install-html, dvi, pdf, install-pdf)
> clean, maintainer-clean, realclean): Remove body.
> * etc/configbuild.ein, etc/configbuild.fig, etc/configbuild.jin,
> etc/configbuild.tin, etc/configdev.ein, etc/configdev.fig,
> etc/configdev.jin, etc/configdev.tin, etc/configure.texi,
> etc/fdl.texi, etc/gnu-oids.texi, etc/make-stds.texi,
> etc/standards.texi: Remove.
I think we've had enough time for anyone to register disagreement with
this patch, so OK to apply.
I notice this leaves us with a Makefile that does nothing. As a
followup you might like to delete etc/configure* and etc/Makefile.in
and remove the line "host_modules= { module= etc; };" in the top level
Makefile.def. I also see this in Makefile.tpl
dist:
@echo "Building a full distribution of this tree isn't done"
@echo "via 'make dist'. Check out the etc/ subdirectory"
Seems like that should be removed too.
The top level Makefile.def and Makefile.tpl changes (and regen of
Makefile.in) would need to be applied to mainline gcc too.
Alan Modra <amodra@gmail.com> skribis:
> On Thu, Jun 26, 2014 at 02:57:23PM +0200, Ludovic Courtès wrote:
>> etc/ChangeLog
>> 2014-06-26 Ludovic Courtès <ludo@gnu.org>
>>
>> PR external/16327
>> PR external/16328
>> * Makefile.in (MAKEINFO, TEXI2DVI, TEXI2PDF, TEXI2HTML, DVIPS,
>> TEXIDIR, INFOFILES, DVIFILES, PDFFILES, HTMLFILES): Remove.
>> (all): Remove dependency on 'info'.
>> (install): Remove dependency on 'install-info'.
>> (standards.info, standards.html, standards.dvi, standards.ps)
>> standards.pdf, configure.info, configure.dvi, configure.ps,
>> configure.pdf, configure.pdf): Remove.
>> (info, install-info, html, install-html, dvi, pdf, install-pdf)
>> clean, maintainer-clean, realclean): Remove body.
>> * etc/configbuild.ein, etc/configbuild.fig, etc/configbuild.jin,
>> etc/configbuild.tin, etc/configdev.ein, etc/configdev.fig,
>> etc/configdev.jin, etc/configdev.tin, etc/configure.texi,
>> etc/fdl.texi, etc/gnu-oids.texi, etc/make-stds.texi,
>> etc/standards.texi: Remove.
>
> I think we've had enough time for anyone to register disagreement with
> this patch, so OK to apply.
OK, pushed to master.
It would make sense to push it to gdb-7.8-branch as well, WDYT?
> I notice this leaves us with a Makefile that does nothing. As a
> followup you might like to delete etc/configure* and etc/Makefile.in
> and remove the line "host_modules= { module= etc; };" in the top level
> Makefile.def. I also see this in Makefile.tpl
> dist:
> @echo "Building a full distribution of this tree isn't done"
> @echo "via 'make dist'. Check out the etc/ subdirectory"
> Seems like that should be removed too.
Right, I’ll look into it.
> The top level Makefile.def and Makefile.tpl changes (and regen of
> Makefile.in) would need to be applied to mainline gcc too.
OK.
Thanks,
Ludo’.
> It would make sense to push it to gdb-7.8-branch as well, WDYT?
Can you explain why you would like to push it to 7.8? I'd like us
to only apply patches that really fix regressions or bad issues.
If you think this patch qualifies and explain why, then we can
give you the OK.
Joel Brobecker <brobecker@adacore.com> skribis:
>> It would make sense to push it to gdb-7.8-branch as well, WDYT?
>
> Can you explain why you would like to push it to 7.8?
It’s been a (minor) annoyance that both Binutils and GDB install those
files, which were outdated moreover. Thus I think it’s better if 7.8
can have that patch, but it’s not critical either.
> I'd like us to only apply patches that really fix regressions or bad
> issues. If you think this patch qualifies and explain why, then we
> can give you the OK.
The patch only removes a two documents and the associated makefile
machinery from etc/. I think it’s safe.
Thanks,
Ludo’.
> It’s been a (minor) annoyance that both Binutils and GDB install those
> files, which were outdated moreover. Thus I think it’s better if 7.8
> can have that patch, but it’s not critical either.
>
> > I'd like us to only apply patches that really fix regressions or bad
> > issues. If you think this patch qualifies and explain why, then we
> > can give you the OK.
>
> The patch only removes a two documents and the associated makefile
> machinery from etc/. I think it’s safe.
I don't have a strong opinion, but because it's only minor and because
it touches a top-level Makefile (regardless of how simple the change
might be), I'd be inclined to keep it out. But if you and others think
otherwise, I am not objecting.
@@ -37,187 +37,12 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
- then echo ../texinfo/makeinfo/makeinfo; \
- else echo makeinfo; fi`
-TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \
- then echo ../texinfo/util/texi2dvi; \
- else echo texi2dvi; fi`
-TEXI2PDF = `if [ -f ../texinfo/util/texi2dvi ]; \
- then echo "../texinfo/util/texi2dvi --pdf"; \
- else echo "texi2dvi --pdf"; fi`
-TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
- then echo "../texinfo/makeinfo/makeinfo --html"; \
- else echo "makeinfo --html"; fi`
-
-DVIPS = dvips
-
-# Where to find texinfo.tex to format documentation with TeX.
-TEXIDIR = $(srcdir)/../texinfo
-
#### Host, target, and site specific Makefile fragments come in here.
###
-INFOFILES = standards.info configure.info
-DVIFILES = standards.dvi configure.dvi
-PDFFILES = standards.pdf configure.pdf
-HTMLFILES = standards.html configure.html
-
-all: info
-install install-strip: install-info
-
-uninstall:
-
-info:
- for f in $(INFOFILES); do \
- if test -f $(srcdir)/`echo $$f | sed -e 's/.info$$/.texi/'`; then \
- if $(MAKE) "MAKEINFO=$(MAKEINFO)" $$f; then \
- true; \
- else \
- exit 1; \
- fi; \
- fi; \
- done
-
-install-info: info
- $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
- if test ! -f standards.info; then cd $(srcdir); fi; \
- if test -f standards.info; then \
- for i in standards.info*; do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
- done; \
- fi
- if test ! -f configure.info; then cd $(srcdir); fi; \
- if test -f configure.info; then \
- for i in configure.info*; do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
- done; \
- fi
-
-html:
- for f in $(HTMLFILES); do \
- if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \
- if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \
- true; \
- else \
- exit 1; \
- fi; \
- fi; \
- done
-
-install-html: html
- $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(htmldir)
- if test ! -f standards.html; then cd $(srcdir); fi; \
- if test -f standards.html; then \
- for i in standards.html*; do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
- done; \
- fi
- if test ! -f configure.html; then cd $(srcdir); fi; \
- if test -f configure.html; then \
- for i in configure.html*; do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
- done; \
- fi
-
-dvi:
- for f in $(DVIFILES); do \
- if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \
- if $(MAKE) "TEXI2DVI=$(TEXI2DVI)" $$f; then \
- true; \
- else \
- exit 1; \
- fi; \
- fi; \
- done
-
-pdf:
- for f in $(PDFFILES); do \
- if test -f $(srcdir)/`echo $$f | sed -e 's/.pdf$$/.texi/'`; then \
- if $(MAKE) "TEXI2PDF=$(TEXI2PDF)" $$f; then \
- true; \
- else \
- exit 1; \
- fi; \
- fi; \
- done
-
-install-pdf: pdf
- $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(pdfdir)/etc
- if test ! -f standards.pdf; then cd $(srcdir); fi; \
- if test -f standards.pdf; then \
- for i in standards.pdf*; do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(pdfdir)/etc/$$i; \
- done; \
- fi
- if test ! -f configure.pdf; then cd $(srcdir); fi; \
- if test -f configure.pdf; then \
- for i in configure.pdf*; do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(pdfdir)/etc/$$i; \
- done; \
- fi
-
-standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
- $(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi
-
-standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
- $(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi
-
-standards.dvi: $(srcdir)/standards.texi
- TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi
-
-standards.ps: standards.dvi
- $(DVIPS) standards.dvi -o standards.ps
-
-standards.pdf: $(srcdir)/standards.texi
- TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2PDF) $(srcdir)/standards.texi
-
-# makeinfo requires images to be in the current directory.
-configure.info: $(srcdir)/configure.texi $(srcdir)/configdev.tin $(srcdir)/configbuild.tin
- rm -f configdev.txt configbuild.txt
- cp $(srcdir)/configdev.tin configdev.txt
- cp $(srcdir)/configbuild.tin configbuild.txt
- $(MAKEINFO) -I$(srcdir) -o configure.info $(srcdir)/configure.texi
- rm -f configdev.txt configbuild.txt
-
-# texi2dvi wants both the .txt and the .eps files.
-configure.dvi: $(srcdir)/configure.texi $(srcdir)/configdev.tin $(srcdir)/configbuild.tin $(srcdir)/configdev.ein $(srcdir)/configbuild.ein
- rm -f configdev.txt configbuild.txt
- cp $(srcdir)/configdev.tin configdev.txt
- cp $(srcdir)/configbuild.tin configbuild.txt
- rm -f configdev.eps configbuild.eps
- cp $(srcdir)/configdev.ein configdev.eps
- cp $(srcdir)/configbuild.ein configbuild.eps
- TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/configure.texi
- rm -f configdev.txt configbuild.txt
- rm -f configdev.eps configbuild.eps
-
-# dvips requires images to be in the current directory
-configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein
- rm -f configdev.eps configbuild.eps
- cp $(srcdir)/configdev.ein configdev.eps
- cp $(srcdir)/configbuild.ein configbuild.eps
- $(DVIPS) configure.dvi -o configure.ps
- rm -f configdev.eps configbuild.eps
-
-configure.pdf: $(srcdir)/configure.texi $(srcdir)/configdev.tin $(srcdir)/configbuild.tin $(srcdir)/configdev.ein $(srcdir)/configbuild.ein
- rm -f configdev.pdf configbuild.pdf
- epstopdf $(srcdir)/configdev.ein -outfile=configdev.pdf
- epstopdf $(srcdir)/configbuild.ein -outfile=configbuild.pdf
- TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2PDF) $(srcdir)/configure.texi
- rm -f configdev.pdf configbuild.pdf
-
-configure.html: $(srcdir)/configure.texi
- cp $(srcdir)/configdev.jin configdev.jpg
- cp $(srcdir)/configbuild.jin configbuild.jpg
- $(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi
+all:
clean:
- rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
- rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
- rm -f configdev.txt configbuild.txt
- rm -f configdev.eps configbuild.eps
- rm -f configdev.jpg configbuild.jpg
mostlyclean: clean
@@ -225,8 +50,6 @@ distclean: clean
rm -f Makefile config.status config.cache
maintainer-clean realclean: distclean
- rm -f *.html*
- rm -f *.info*
Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag) \
config.status
@@ -244,5 +67,8 @@ config.status: $(srcdir)/configure
## these last targets are for standards.texi conformance
dist:
check:
+info html dvi ps pdf:
+install install-strip install-info install-html install-pdf:
installcheck:
+uninstall:
TAGS: