| Message ID | 20161206141343.28044-14-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > Splitting the info files doesn't bring much benefits these days. > This fixes also untracked generated info files from git ignore. > > Let's use MAKEINFOFLAGS for common flags, --number-sections is already > the default anyway, so adding it doesn't change the info output. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > Makefile | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index 361773634d..0bc470d974 100644 > --- a/Makefile > +++ b/Makefile > @@ -529,17 +529,17 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ > > # documentation > MAKEINFO=makeinfo > -MAKEINFOFLAGS=--no-headers --no-split --number-sections > +MAKEINFOFLAGS=--no-split --number-sections > TEXIFLAG=$(if $(V),,--quiet) > %.dvi: %.texi > $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<,"GEN","$@") > > %.html: %.texi > - $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \ > - "GEN","$@") > + $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \ > + --html $< -o $@,"GEN","$@") > > %.info: %.texi > - $(call quiet-command,$(MAKEINFO) $< -o $@,"GEN","$@") > + $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") > > %.pdf: %.texi > $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"GEN","$@") Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/Makefile b/Makefile index 361773634d..0bc470d974 100644 --- a/Makefile +++ b/Makefile @@ -529,17 +529,17 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ # documentation MAKEINFO=makeinfo -MAKEINFOFLAGS=--no-headers --no-split --number-sections +MAKEINFOFLAGS=--no-split --number-sections TEXIFLAG=$(if $(V),,--quiet) %.dvi: %.texi $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<,"GEN","$@") %.html: %.texi - $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \ - "GEN","$@") + $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \ + --html $< -o $@,"GEN","$@") %.info: %.texi - $(call quiet-command,$(MAKEINFO) $< -o $@,"GEN","$@") + $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") %.pdf: %.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"GEN","$@")
Splitting the info files doesn't bring much benefits these days. This fixes also untracked generated info files from git ignore. Let's use MAKEINFOFLAGS for common flags, --number-sections is already the default anyway, so adding it doesn't change the info output. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)