public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] gdb: Add missing install-dvi Makefile target
@ 2024-04-04 21:59 Christophe Lyon
  2024-04-06  4:13 ` Thiago Jung Bauermann
  0 siblings, 1 reply; 8+ messages in thread
From: Christophe Lyon @ 2024-04-04 21:59 UTC (permalink / raw)
  To: gdb-patches; +Cc: Christophe Lyon

For some reason install-dvi is missing although other targets of the
same family are present. This looks like an oversight.

This enables calling 'make install-dvi' from the top-level build
directory.
---
 gdb/Makefile.in                |  2 +-
 gdb/data-directory/Makefile.in |  2 +-
 gdb/doc/Makefile.in            | 19 +++++++++++++++++--
 gdb/testsuite/Makefile.in      |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 40732cb2227..d001359539a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2035,7 +2035,7 @@ check-headers:
 	done
 .PHONY: check-headers
 
-info install-info clean-info dvi pdf install-pdf html install-html: force
+info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
 	@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
 # Traditionally "install" depends on "all".  But it may be useful
diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index 2a40be4ade0..2db8706eba6 100644
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean
 .PHONY: install-info install-pdf install-html clean-info
 check installcheck:
 info dvi pdf html:
-install-info install-pdf install-html:
+install-info install-dvi install-pdf install-html:
 clean-info:
 
 # GNU Make has an annoying habit of putting *all* the Makefile variables
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 04f9dbd27f0..8007f6373d4 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -24,6 +24,7 @@ prefix = @prefix@
 infodir = @infodir@
 datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 pdfdir = @pdfdir@
 htmldir = @htmldir@
 mandir = @mandir@
@@ -87,6 +88,8 @@ SET_TEXINPUTS = \
 # Files which should be generated via 'info' and installed by 'install-info'
 INFO_DEPS = gdb.info stabs.info annotate.info
 
+# Files which should be generated via 'dvi' and installed by 'install-dvi'
+DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
 # Files which should be generated via 'pdf' and installed by 'install-pdf'
 PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
 # Files which should be generated via 'html' and installed by 'install-html'
@@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
 all: info
 
 info: $(INFO_DEPS)
-dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
+dvi: $(DVIFILES)
 ps: gdb.ps stabs.ps refcard.ps annotate.ps
 html: $(HTMLFILES)
 pdf: $(PDFFILES)
@@ -233,7 +236,7 @@ Doxyfile-gdb-xref:	$(srcdir)/Doxyfile-gdb-xref.in
 Doxyfile-gdbserver:	$(srcdir)/Doxyfile-gdbserver.in
 	$(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
 
-all-doc: info dvi ps # pdf
+all-doc: info dvi ps pdf
 diststuff: info man
 	rm -f gdb-cfg.texi
 
@@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
 	  fi; \
 	done
 
+dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-dvi: $(DVIFILES)
+	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
+	@list='$(DVIFILES)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(dvi__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+	done
+
 pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 
 install-pdf: $(PDFFILES)
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index f6603daf7fd..f799f16c2bb 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -105,6 +105,7 @@ INFODIRS=doc
 info:
 install-info:
 dvi:
+install-dvi:
 pdf:
 install-pdf:
 html:
-- 
2.34.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb: Add missing install-dvi Makefile target
  2024-04-04 21:59 [PATCH] gdb: Add missing install-dvi Makefile target Christophe Lyon
@ 2024-04-06  4:13 ` Thiago Jung Bauermann
  2024-04-07 19:08   ` Christophe Lyon
  0 siblings, 1 reply; 8+ messages in thread
From: Thiago Jung Bauermann @ 2024-04-06  4:13 UTC (permalink / raw)
  To: Christophe Lyon; +Cc: gdb-patches


Hello Christophe,

Thank you for the patch! Just a couple of minor comments:

Christophe Lyon <christophe.lyon@linaro.org> writes:

> For some reason install-dvi is missing although other targets of the
> same family are present. This looks like an oversight.
>
> This enables calling 'make install-dvi' from the top-level build
> directory.

I can confirm that 'make install-dvi' works from inside $BUILD/gdb, but
from $BUILD I get this error:

Doing install-dvi in libdecnumber
make[2]: Entering directory '/home/thiago.bauermann/.cache/builds/gdb-native/libdecnumber'
make[2]: *** No rule to make target 'install-dvi'.  Stop.
make[2]: Leaving directory '/home/thiago.bauermann/.cache/builds/gdb-native/libdecnumber'
make[1]: *** [Makefile:7855: install-dvi-libdecnumber] Error 1
make[1]: Leaving directory '/home/thiago.bauermann/.cache/builds/gdb-native'
make: *** [Makefile:1669: do-install-dvi] Error 2

With 'make -k' I see that gdbserver also lacks an install-dvi target.

> @@ -233,7 +236,7 @@ Doxyfile-gdb-xref:	$(srcdir)/Doxyfile-gdb-xref.in
>  Doxyfile-gdbserver:	$(srcdir)/Doxyfile-gdbserver.in
>  	$(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
>
> -all-doc: info dvi ps # pdf
> +all-doc: info dvi ps pdf
>  diststuff: info man
>  	rm -f gdb-cfg.texi
>

This seems unrelated.

--
Thiago

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb: Add missing install-dvi Makefile target
  2024-04-06  4:13 ` Thiago Jung Bauermann
@ 2024-04-07 19:08   ` Christophe Lyon
  2024-04-07 19:10     ` [PATCH v2] gdb, gdbserver: " Christophe Lyon
  0 siblings, 1 reply; 8+ messages in thread
From: Christophe Lyon @ 2024-04-07 19:08 UTC (permalink / raw)
  To: Thiago Jung Bauermann; +Cc: gdb-patches

On Sat, 6 Apr 2024 at 06:13, Thiago Jung Bauermann
<thiago.bauermann@linaro.org> wrote:
>
>
> Hello Christophe,
>
> Thank you for the patch! Just a couple of minor comments:
>
> Christophe Lyon <christophe.lyon@linaro.org> writes:
>
> > For some reason install-dvi is missing although other targets of the
> > same family are present. This looks like an oversight.
> >
> > This enables calling 'make install-dvi' from the top-level build
> > directory.
>
> I can confirm that 'make install-dvi' works from inside $BUILD/gdb, but
> from $BUILD I get this error:
>
> Doing install-dvi in libdecnumber
> make[2]: Entering directory '/home/thiago.bauermann/.cache/builds/gdb-native/libdecnumber'
> make[2]: *** No rule to make target 'install-dvi'.  Stop.
> make[2]: Leaving directory '/home/thiago.bauermann/.cache/builds/gdb-native/libdecnumber'
> make[1]: *** [Makefile:7855: install-dvi-libdecnumber] Error 1
> make[1]: Leaving directory '/home/thiago.bauermann/.cache/builds/gdb-native'
> make: *** [Makefile:1669: do-install-dvi] Error 2
>
Hmmm so the master copy of libdecnumber is in GCC IIUC, which does
contain the install-dvi target.
Looks like gdb needs to sync with gcc's current version of
libdecnumber? (which should be a different patch, of course)

> With 'make -k' I see that gdbserver also lacks an install-dvi target.
Ack, sorry for missing this (our build script does not try to build
any doc from gdbserver.
In fact, the man page for gdbserver is part of gdb/doc, but there's no
other doc for gdbserver there (no info/dvi/pdf/texinfo). Is that
expected?
IIUC gdbserver.1 is extracted from the main gdb.texinfo, but there's
no such rule to generate gdbserver.{info/dvi/pdf/html}, an oversight?

>
> > @@ -233,7 +236,7 @@ Doxyfile-gdb-xref:        $(srcdir)/Doxyfile-gdb-xref.in
> >  Doxyfile-gdbserver:  $(srcdir)/Doxyfile-gdbserver.in
> >       $(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
> >
> > -all-doc: info dvi ps # pdf
> > +all-doc: info dvi ps pdf
> >  diststuff: info man
> >       rm -f gdb-cfg.texi
>
> This seems unrelated.
>
Indeed, that doesn't match the subject/commit message I proposed, I
can put this into a separate patch if you want, or document this
change in the commit message: it looks like an other oversight?

Thanks,

Christophe

> --
> Thiago

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2] gdb, gdbserver: Add missing install-dvi Makefile target
  2024-04-07 19:08   ` Christophe Lyon
@ 2024-04-07 19:10     ` Christophe Lyon
  2024-04-09 23:00       ` Luis Machado
  0 siblings, 1 reply; 8+ messages in thread
From: Christophe Lyon @ 2024-04-07 19:10 UTC (permalink / raw)
  To: gdb-patches; +Cc: Christophe Lyon

For some reason install-dvi is missing although other targets of the
same family are present. This looks like an oversight.

This enables calling 'make install-dvi' from the top-level build
directory.

Fix what looks like another oversight: include 'pdf' in 'all-doc' in
gdb/doc/Makefile.in.
---
 gdb/Makefile.in                |  2 +-
 gdb/data-directory/Makefile.in |  2 +-
 gdb/doc/Makefile.in            | 19 +++++++++++++++++--
 gdb/testsuite/Makefile.in      |  1 +
 gdbserver/Makefile.in          |  1 +
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 40732cb2227..d001359539a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2035,7 +2035,7 @@ check-headers:
 	done
 .PHONY: check-headers
 
-info install-info clean-info dvi pdf install-pdf html install-html: force
+info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
 	@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
 # Traditionally "install" depends on "all".  But it may be useful
diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index 2a40be4ade0..2db8706eba6 100644
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean
 .PHONY: install-info install-pdf install-html clean-info
 check installcheck:
 info dvi pdf html:
-install-info install-pdf install-html:
+install-info install-dvi install-pdf install-html:
 clean-info:
 
 # GNU Make has an annoying habit of putting *all* the Makefile variables
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 04f9dbd27f0..8007f6373d4 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -24,6 +24,7 @@ prefix = @prefix@
 infodir = @infodir@
 datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 pdfdir = @pdfdir@
 htmldir = @htmldir@
 mandir = @mandir@
@@ -87,6 +88,8 @@ SET_TEXINPUTS = \
 # Files which should be generated via 'info' and installed by 'install-info'
 INFO_DEPS = gdb.info stabs.info annotate.info
 
+# Files which should be generated via 'dvi' and installed by 'install-dvi'
+DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
 # Files which should be generated via 'pdf' and installed by 'install-pdf'
 PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
 # Files which should be generated via 'html' and installed by 'install-html'
@@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
 all: info
 
 info: $(INFO_DEPS)
-dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
+dvi: $(DVIFILES)
 ps: gdb.ps stabs.ps refcard.ps annotate.ps
 html: $(HTMLFILES)
 pdf: $(PDFFILES)
@@ -233,7 +236,7 @@ Doxyfile-gdb-xref:	$(srcdir)/Doxyfile-gdb-xref.in
 Doxyfile-gdbserver:	$(srcdir)/Doxyfile-gdbserver.in
 	$(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
 
-all-doc: info dvi ps # pdf
+all-doc: info dvi ps pdf
 diststuff: info man
 	rm -f gdb-cfg.texi
 
@@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
 	  fi; \
 	done
 
+dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-dvi: $(DVIFILES)
+	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
+	@list='$(DVIFILES)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(dvi__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+	done
+
 pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 
 install-pdf: $(PDFFILES)
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index f6603daf7fd..f799f16c2bb 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -105,6 +105,7 @@ INFODIRS=doc
 info:
 install-info:
 dvi:
+install-dvi:
 pdf:
 install-pdf:
 html:
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index d12f8746611..4eed8926f48 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -342,6 +342,7 @@ installcheck:
 check:
 info dvi pdf:
 install-info:
+install-dvi:
 install-pdf:
 html:
 install-html:
-- 
2.34.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] gdb, gdbserver: Add missing install-dvi Makefile target
  2024-04-07 19:10     ` [PATCH v2] gdb, gdbserver: " Christophe Lyon
@ 2024-04-09 23:00       ` Luis Machado
  2024-04-10  8:10         ` Christophe Lyon
  0 siblings, 1 reply; 8+ messages in thread
From: Luis Machado @ 2024-04-09 23:00 UTC (permalink / raw)
  To: Christophe Lyon, gdb-patches

On 4/7/24 20:10, Christophe Lyon wrote:
> For some reason install-dvi is missing although other targets of the
> same family are present. This looks like an oversight.
> 
> This enables calling 'make install-dvi' from the top-level build
> directory.
> 
> Fix what looks like another oversight: include 'pdf' in 'all-doc' in
> gdb/doc/Makefile.in.
> ---
>  gdb/Makefile.in                |  2 +-
>  gdb/data-directory/Makefile.in |  2 +-
>  gdb/doc/Makefile.in            | 19 +++++++++++++++++--
>  gdb/testsuite/Makefile.in      |  1 +
>  gdbserver/Makefile.in          |  1 +
>  5 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> index 40732cb2227..d001359539a 100644
> --- a/gdb/Makefile.in
> +++ b/gdb/Makefile.in
> @@ -2035,7 +2035,7 @@ check-headers:
>  	done
>  .PHONY: check-headers
>  
> -info install-info clean-info dvi pdf install-pdf html install-html: force
> +info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
>  	@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
>  
>  # Traditionally "install" depends on "all".  But it may be useful
> diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
> index 2a40be4ade0..2db8706eba6 100644
> --- a/gdb/data-directory/Makefile.in
> +++ b/gdb/data-directory/Makefile.in
> @@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean
>  .PHONY: install-info install-pdf install-html clean-info
>  check installcheck:
>  info dvi pdf html:
> -install-info install-pdf install-html:
> +install-info install-dvi install-pdf install-html:
>  clean-info:
>  
>  # GNU Make has an annoying habit of putting *all* the Makefile variables
> diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
> index 04f9dbd27f0..8007f6373d4 100644
> --- a/gdb/doc/Makefile.in
> +++ b/gdb/doc/Makefile.in
> @@ -24,6 +24,7 @@ prefix = @prefix@
>  infodir = @infodir@
>  datarootdir = @datarootdir@
>  docdir = @docdir@
> +dvidir = @dvidir@
>  pdfdir = @pdfdir@
>  htmldir = @htmldir@
>  mandir = @mandir@
> @@ -87,6 +88,8 @@ SET_TEXINPUTS = \
>  # Files which should be generated via 'info' and installed by 'install-info'
>  INFO_DEPS = gdb.info stabs.info annotate.info
>  
> +# Files which should be generated via 'dvi' and installed by 'install-dvi'
> +DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
>  # Files which should be generated via 'pdf' and installed by 'install-pdf'
>  PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
>  # Files which should be generated via 'html' and installed by 'install-html'
> @@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
>  all: info
>  
>  info: $(INFO_DEPS)
> -dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
> +dvi: $(DVIFILES)
>  ps: gdb.ps stabs.ps refcard.ps annotate.ps
>  html: $(HTMLFILES)
>  pdf: $(PDFFILES)
> @@ -233,7 +236,7 @@ Doxyfile-gdb-xref:	$(srcdir)/Doxyfile-gdb-xref.in
>  Doxyfile-gdbserver:	$(srcdir)/Doxyfile-gdbserver.in
>  	$(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
>  
> -all-doc: info dvi ps # pdf
> +all-doc: info dvi ps pdf
>  diststuff: info man
>  	rm -f gdb-cfg.texi
>  
> @@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
>  	  fi; \
>  	done
>  
> +dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
> +
> +install-dvi: $(DVIFILES)
> +	@$(NORMAL_INSTALL)
> +	test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
> +	@list='$(DVIFILES)'; for p in $$list; do \
> +	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
> +	  f=$(dvi__strip_dir) \
> +	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
> +	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
> +	done
> +
>  pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>  
>  install-pdf: $(PDFFILES)
> diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
> index f6603daf7fd..f799f16c2bb 100644
> --- a/gdb/testsuite/Makefile.in
> +++ b/gdb/testsuite/Makefile.in
> @@ -105,6 +105,7 @@ INFODIRS=doc
>  info:
>  install-info:
>  dvi:
> +install-dvi:
>  pdf:
>  install-pdf:
>  html:
> diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
> index d12f8746611..4eed8926f48 100644
> --- a/gdbserver/Makefile.in
> +++ b/gdbserver/Makefile.in
> @@ -342,6 +342,7 @@ installcheck:
>  check:
>  info dvi pdf:
>  install-info:
> +install-dvi:
>  install-pdf:
>  html:
>  install-html:

I gave this a try and install-dvi almost fully works from the top level, though it still fails for gprofng.

Maybe something for the binutils folks? Otherwise this part looks OK to me.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] gdb, gdbserver: Add missing install-dvi Makefile target
  2024-04-09 23:00       ` Luis Machado
@ 2024-04-10  8:10         ` Christophe Lyon
  2024-04-10 10:02           ` Christophe Lyon
  0 siblings, 1 reply; 8+ messages in thread
From: Christophe Lyon @ 2024-04-10  8:10 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Wed, 10 Apr 2024 at 01:00, Luis Machado <luis.machado@arm.com> wrote:
>
> On 4/7/24 20:10, Christophe Lyon wrote:
> > For some reason install-dvi is missing although other targets of the
> > same family are present. This looks like an oversight.
> >
> > This enables calling 'make install-dvi' from the top-level build
> > directory.
> >
> > Fix what looks like another oversight: include 'pdf' in 'all-doc' in
> > gdb/doc/Makefile.in.
> > ---
> >  gdb/Makefile.in                |  2 +-
> >  gdb/data-directory/Makefile.in |  2 +-
> >  gdb/doc/Makefile.in            | 19 +++++++++++++++++--
> >  gdb/testsuite/Makefile.in      |  1 +
> >  gdbserver/Makefile.in          |  1 +
> >  5 files changed, 21 insertions(+), 4 deletions(-)
> >
> > diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> > index 40732cb2227..d001359539a 100644
> > --- a/gdb/Makefile.in
> > +++ b/gdb/Makefile.in
> > @@ -2035,7 +2035,7 @@ check-headers:
> >       done
> >  .PHONY: check-headers
> >
> > -info install-info clean-info dvi pdf install-pdf html install-html: force
> > +info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
> >       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
> >
> >  # Traditionally "install" depends on "all".  But it may be useful
> > diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
> > index 2a40be4ade0..2db8706eba6 100644
> > --- a/gdb/data-directory/Makefile.in
> > +++ b/gdb/data-directory/Makefile.in
> > @@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean
> >  .PHONY: install-info install-pdf install-html clean-info
> >  check installcheck:
> >  info dvi pdf html:
> > -install-info install-pdf install-html:
> > +install-info install-dvi install-pdf install-html:
> >  clean-info:
> >
> >  # GNU Make has an annoying habit of putting *all* the Makefile variables
> > diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
> > index 04f9dbd27f0..8007f6373d4 100644
> > --- a/gdb/doc/Makefile.in
> > +++ b/gdb/doc/Makefile.in
> > @@ -24,6 +24,7 @@ prefix = @prefix@
> >  infodir = @infodir@
> >  datarootdir = @datarootdir@
> >  docdir = @docdir@
> > +dvidir = @dvidir@
> >  pdfdir = @pdfdir@
> >  htmldir = @htmldir@
> >  mandir = @mandir@
> > @@ -87,6 +88,8 @@ SET_TEXINPUTS = \
> >  # Files which should be generated via 'info' and installed by 'install-info'
> >  INFO_DEPS = gdb.info stabs.info annotate.info
> >
> > +# Files which should be generated via 'dvi' and installed by 'install-dvi'
> > +DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
> >  # Files which should be generated via 'pdf' and installed by 'install-pdf'
> >  PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
> >  # Files which should be generated via 'html' and installed by 'install-html'
> > @@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
> >  all: info
> >
> >  info: $(INFO_DEPS)
> > -dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
> > +dvi: $(DVIFILES)
> >  ps: gdb.ps stabs.ps refcard.ps annotate.ps
> >  html: $(HTMLFILES)
> >  pdf: $(PDFFILES)
> > @@ -233,7 +236,7 @@ Doxyfile-gdb-xref:        $(srcdir)/Doxyfile-gdb-xref.in
> >  Doxyfile-gdbserver:  $(srcdir)/Doxyfile-gdbserver.in
> >       $(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
> >
> > -all-doc: info dvi ps # pdf
> > +all-doc: info dvi ps pdf
> >  diststuff: info man
> >       rm -f gdb-cfg.texi
> >
> > @@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
> >         fi; \
> >       done
> >
> > +dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
> > +
> > +install-dvi: $(DVIFILES)
> > +     @$(NORMAL_INSTALL)
> > +     test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
> > +     @list='$(DVIFILES)'; for p in $$list; do \
> > +       if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
> > +       f=$(dvi__strip_dir) \
> > +       echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
> > +       $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
> > +     done
> > +
> >  pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
> >
> >  install-pdf: $(PDFFILES)
> > diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
> > index f6603daf7fd..f799f16c2bb 100644
> > --- a/gdb/testsuite/Makefile.in
> > +++ b/gdb/testsuite/Makefile.in
> > @@ -105,6 +105,7 @@ INFODIRS=doc
> >  info:
> >  install-info:
> >  dvi:
> > +install-dvi:
> >  pdf:
> >  install-pdf:
> >  html:
> > diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
> > index d12f8746611..4eed8926f48 100644
> > --- a/gdbserver/Makefile.in
> > +++ b/gdbserver/Makefile.in
> > @@ -342,6 +342,7 @@ installcheck:
> >  check:
> >  info dvi pdf:
> >  install-info:
> > +install-dvi:
> >  install-pdf:
> >  html:
> >  install-html:
>
> I gave this a try and install-dvi almost fully works from the top level, though it still fails for gprofng.
>
> Maybe something for the binutils folks? Otherwise this part looks OK to me.

Thanks for checking. Yes IIUC gprofng is part of binutils, and I
didn't notice because we don't build it ;-)

Thanks,

Christophe

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] gdb, gdbserver: Add missing install-dvi Makefile target
  2024-04-10  8:10         ` Christophe Lyon
@ 2024-04-10 10:02           ` Christophe Lyon
  2024-04-10 13:00             ` Luis Machado
  0 siblings, 1 reply; 8+ messages in thread
From: Christophe Lyon @ 2024-04-10 10:02 UTC (permalink / raw)
  To: Luis Machado; +Cc: gdb-patches

On Wed, 10 Apr 2024 at 10:10, Christophe Lyon
<christophe.lyon@linaro.org> wrote:
>
> On Wed, 10 Apr 2024 at 01:00, Luis Machado <luis.machado@arm.com> wrote:
> >
> > On 4/7/24 20:10, Christophe Lyon wrote:
> > > For some reason install-dvi is missing although other targets of the
> > > same family are present. This looks like an oversight.
> > >
> > > This enables calling 'make install-dvi' from the top-level build
> > > directory.
> > >
> > > Fix what looks like another oversight: include 'pdf' in 'all-doc' in
> > > gdb/doc/Makefile.in.
> > > ---
> > >  gdb/Makefile.in                |  2 +-
> > >  gdb/data-directory/Makefile.in |  2 +-
> > >  gdb/doc/Makefile.in            | 19 +++++++++++++++++--
> > >  gdb/testsuite/Makefile.in      |  1 +
> > >  gdbserver/Makefile.in          |  1 +
> > >  5 files changed, 21 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> > > index 40732cb2227..d001359539a 100644
> > > --- a/gdb/Makefile.in
> > > +++ b/gdb/Makefile.in
> > > @@ -2035,7 +2035,7 @@ check-headers:
> > >       done
> > >  .PHONY: check-headers
> > >
> > > -info install-info clean-info dvi pdf install-pdf html install-html: force
> > > +info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
> > >       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
> > >
> > >  # Traditionally "install" depends on "all".  But it may be useful
> > > diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
> > > index 2a40be4ade0..2db8706eba6 100644
> > > --- a/gdb/data-directory/Makefile.in
> > > +++ b/gdb/data-directory/Makefile.in
> > > @@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean
> > >  .PHONY: install-info install-pdf install-html clean-info
> > >  check installcheck:
> > >  info dvi pdf html:
> > > -install-info install-pdf install-html:
> > > +install-info install-dvi install-pdf install-html:
> > >  clean-info:
> > >
> > >  # GNU Make has an annoying habit of putting *all* the Makefile variables
> > > diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
> > > index 04f9dbd27f0..8007f6373d4 100644
> > > --- a/gdb/doc/Makefile.in
> > > +++ b/gdb/doc/Makefile.in
> > > @@ -24,6 +24,7 @@ prefix = @prefix@
> > >  infodir = @infodir@
> > >  datarootdir = @datarootdir@
> > >  docdir = @docdir@
> > > +dvidir = @dvidir@
> > >  pdfdir = @pdfdir@
> > >  htmldir = @htmldir@
> > >  mandir = @mandir@
> > > @@ -87,6 +88,8 @@ SET_TEXINPUTS = \
> > >  # Files which should be generated via 'info' and installed by 'install-info'
> > >  INFO_DEPS = gdb.info stabs.info annotate.info
> > >
> > > +# Files which should be generated via 'dvi' and installed by 'install-dvi'
> > > +DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
> > >  # Files which should be generated via 'pdf' and installed by 'install-pdf'
> > >  PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
> > >  # Files which should be generated via 'html' and installed by 'install-html'
> > > @@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
> > >  all: info
> > >
> > >  info: $(INFO_DEPS)
> > > -dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
> > > +dvi: $(DVIFILES)
> > >  ps: gdb.ps stabs.ps refcard.ps annotate.ps
> > >  html: $(HTMLFILES)
> > >  pdf: $(PDFFILES)
> > > @@ -233,7 +236,7 @@ Doxyfile-gdb-xref:        $(srcdir)/Doxyfile-gdb-xref.in
> > >  Doxyfile-gdbserver:  $(srcdir)/Doxyfile-gdbserver.in
> > >       $(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
> > >
> > > -all-doc: info dvi ps # pdf
> > > +all-doc: info dvi ps pdf
> > >  diststuff: info man
> > >       rm -f gdb-cfg.texi
> > >
> > > @@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
> > >         fi; \
> > >       done
> > >
> > > +dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
> > > +
> > > +install-dvi: $(DVIFILES)
> > > +     @$(NORMAL_INSTALL)
> > > +     test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
> > > +     @list='$(DVIFILES)'; for p in $$list; do \
> > > +       if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
> > > +       f=$(dvi__strip_dir) \
> > > +       echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
> > > +       $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
> > > +     done
> > > +
> > >  pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
> > >
> > >  install-pdf: $(PDFFILES)
> > > diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
> > > index f6603daf7fd..f799f16c2bb 100644
> > > --- a/gdb/testsuite/Makefile.in
> > > +++ b/gdb/testsuite/Makefile.in
> > > @@ -105,6 +105,7 @@ INFODIRS=doc
> > >  info:
> > >  install-info:
> > >  dvi:
> > > +install-dvi:
> > >  pdf:
> > >  install-pdf:
> > >  html:
> > > diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
> > > index d12f8746611..4eed8926f48 100644
> > > --- a/gdbserver/Makefile.in
> > > +++ b/gdbserver/Makefile.in
> > > @@ -342,6 +342,7 @@ installcheck:
> > >  check:
> > >  info dvi pdf:
> > >  install-info:
> > > +install-dvi:
> > >  install-pdf:
> > >  html:
> > >  install-html:
> >
> > I gave this a try and install-dvi almost fully works from the top level, though it still fails for gprofng.
> >
> > Maybe something for the binutils folks? Otherwise this part looks OK to me.
>
> Thanks for checking. Yes IIUC gprofng is part of binutils, and I
> didn't notice because we don't build it ;-)
>
This patch should fix it:
https://sourceware.org/pipermail/binutils/2024-April/133528.html

Thanks,

Christophe

> Thanks,
>
> Christophe

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] gdb, gdbserver: Add missing install-dvi Makefile target
  2024-04-10 10:02           ` Christophe Lyon
@ 2024-04-10 13:00             ` Luis Machado
  0 siblings, 0 replies; 8+ messages in thread
From: Luis Machado @ 2024-04-10 13:00 UTC (permalink / raw)
  To: Christophe Lyon; +Cc: gdb-patches, binutils

On 4/10/24 11:02, Christophe Lyon wrote:
> On Wed, 10 Apr 2024 at 10:10, Christophe Lyon
> <christophe.lyon@linaro.org> wrote:
>>
>> On Wed, 10 Apr 2024 at 01:00, Luis Machado <luis.machado@arm.com> wrote:
>>>
>>> On 4/7/24 20:10, Christophe Lyon wrote:
>>>> For some reason install-dvi is missing although other targets of the
>>>> same family are present. This looks like an oversight.
>>>>
>>>> This enables calling 'make install-dvi' from the top-level build
>>>> directory.
>>>>
>>>> Fix what looks like another oversight: include 'pdf' in 'all-doc' in
>>>> gdb/doc/Makefile.in.
>>>> ---
>>>>  gdb/Makefile.in                |  2 +-
>>>>  gdb/data-directory/Makefile.in |  2 +-
>>>>  gdb/doc/Makefile.in            | 19 +++++++++++++++++--
>>>>  gdb/testsuite/Makefile.in      |  1 +
>>>>  gdbserver/Makefile.in          |  1 +
>>>>  5 files changed, 21 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
>>>> index 40732cb2227..d001359539a 100644
>>>> --- a/gdb/Makefile.in
>>>> +++ b/gdb/Makefile.in
>>>> @@ -2035,7 +2035,7 @@ check-headers:
>>>>       done
>>>>  .PHONY: check-headers
>>>>
>>>> -info install-info clean-info dvi pdf install-pdf html install-html: force
>>>> +info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
>>>>       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
>>>>
>>>>  # Traditionally "install" depends on "all".  But it may be useful
>>>> diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
>>>> index 2a40be4ade0..2db8706eba6 100644
>>>> --- a/gdb/data-directory/Makefile.in
>>>> +++ b/gdb/data-directory/Makefile.in
>>>> @@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean
>>>>  .PHONY: install-info install-pdf install-html clean-info
>>>>  check installcheck:
>>>>  info dvi pdf html:
>>>> -install-info install-pdf install-html:
>>>> +install-info install-dvi install-pdf install-html:
>>>>  clean-info:
>>>>
>>>>  # GNU Make has an annoying habit of putting *all* the Makefile variables
>>>> diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
>>>> index 04f9dbd27f0..8007f6373d4 100644
>>>> --- a/gdb/doc/Makefile.in
>>>> +++ b/gdb/doc/Makefile.in
>>>> @@ -24,6 +24,7 @@ prefix = @prefix@
>>>>  infodir = @infodir@
>>>>  datarootdir = @datarootdir@
>>>>  docdir = @docdir@
>>>> +dvidir = @dvidir@
>>>>  pdfdir = @pdfdir@
>>>>  htmldir = @htmldir@
>>>>  mandir = @mandir@
>>>> @@ -87,6 +88,8 @@ SET_TEXINPUTS = \
>>>>  # Files which should be generated via 'info' and installed by 'install-info'
>>>>  INFO_DEPS = gdb.info stabs.info annotate.info
>>>>
>>>> +# Files which should be generated via 'dvi' and installed by 'install-dvi'
>>>> +DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
>>>>  # Files which should be generated via 'pdf' and installed by 'install-pdf'
>>>>  PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
>>>>  # Files which should be generated via 'html' and installed by 'install-html'
>>>> @@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
>>>>  all: info
>>>>
>>>>  info: $(INFO_DEPS)
>>>> -dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
>>>> +dvi: $(DVIFILES)
>>>>  ps: gdb.ps stabs.ps refcard.ps annotate.ps
>>>>  html: $(HTMLFILES)
>>>>  pdf: $(PDFFILES)
>>>> @@ -233,7 +236,7 @@ Doxyfile-gdb-xref:        $(srcdir)/Doxyfile-gdb-xref.in
>>>>  Doxyfile-gdbserver:  $(srcdir)/Doxyfile-gdbserver.in
>>>>       $(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
>>>>
>>>> -all-doc: info dvi ps # pdf
>>>> +all-doc: info dvi ps pdf
>>>>  diststuff: info man
>>>>       rm -f gdb-cfg.texi
>>>>
>>>> @@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
>>>>         fi; \
>>>>       done
>>>>
>>>> +dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>>>> +
>>>> +install-dvi: $(DVIFILES)
>>>> +     @$(NORMAL_INSTALL)
>>>> +     test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
>>>> +     @list='$(DVIFILES)'; for p in $$list; do \
>>>> +       if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>>>> +       f=$(dvi__strip_dir) \
>>>> +       echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
>>>> +       $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
>>>> +     done
>>>> +
>>>>  pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>>>>
>>>>  install-pdf: $(PDFFILES)
>>>> diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
>>>> index f6603daf7fd..f799f16c2bb 100644
>>>> --- a/gdb/testsuite/Makefile.in
>>>> +++ b/gdb/testsuite/Makefile.in
>>>> @@ -105,6 +105,7 @@ INFODIRS=doc
>>>>  info:
>>>>  install-info:
>>>>  dvi:
>>>> +install-dvi:
>>>>  pdf:
>>>>  install-pdf:
>>>>  html:
>>>> diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
>>>> index d12f8746611..4eed8926f48 100644
>>>> --- a/gdbserver/Makefile.in
>>>> +++ b/gdbserver/Makefile.in
>>>> @@ -342,6 +342,7 @@ installcheck:
>>>>  check:
>>>>  info dvi pdf:
>>>>  install-info:
>>>> +install-dvi:
>>>>  install-pdf:
>>>>  html:
>>>>  install-html:
>>>
>>> I gave this a try and install-dvi almost fully works from the top level, though it still fails for gprofng.
>>>
>>> Maybe something for the binutils folks? Otherwise this part looks OK to me.
>>
>> Thanks for checking. Yes IIUC gprofng is part of binutils, and I
>> didn't notice because we don't build it ;-)
>>
> This patch should fix it:
> https://sourceware.org/pipermail/binutils/2024-April/133528.html

Indeed. I suppose the libdecnumber install-dvi failure will have to be addressed by the master copy.

In any case, this looks good. Thanks for fixing it.

Approved-By: Luis Machado <luis.machado@arm.com>
Tested-By: Luis Machado <luis.machado@arm.com>


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-04-10 13:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-04 21:59 [PATCH] gdb: Add missing install-dvi Makefile target Christophe Lyon
2024-04-06  4:13 ` Thiago Jung Bauermann
2024-04-07 19:08   ` Christophe Lyon
2024-04-07 19:10     ` [PATCH v2] gdb, gdbserver: " Christophe Lyon
2024-04-09 23:00       ` Luis Machado
2024-04-10  8:10         ` Christophe Lyon
2024-04-10 10:02           ` Christophe Lyon
2024-04-10 13:00             ` Luis Machado

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).