Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9c9963b authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Revert "DocBook: Avoid building man pages repeatedly and inconsistently" 



This reverts commit b44158b1.  This commit
introduced warnings and possibly inconsistent results into the doc build
process.  The goal is good but it will need to be achieved another way.

Reported-by: default avatarMasanari Iida <standby24x7@gmail.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent b2c4105b

Documentation/DocBook/Makefile

+1 −9
Original line number Original line Diff line number Diff line
@@ -56,13 +56,6 @@ htmldocs: $(HTML) 




MAN := $(patsubst %.xml, %.9, $(BOOKS))

MAN := $(patsubst %.xml, %.9, $(BOOKS))

mandocs: $(MAN)

mandocs: $(MAN)

	@dups=$$(sed -n 's/.*<refname>\([^<]*\)<\/refname>.*/\1/p'	\

		 $(obj)/*.xml.noextra | sort | uniq -d);		\

	if [ -n "$$dups" ]; then					\

		echo >&2 "The following manual pages are generated more than once:"; \

		printf >&2 '%s\n' "$$dups";				\

		exit 1;							\

	fi

	find $(obj)/man -name '*.9' | xargs gzip -nf

	find $(obj)/man -name '*.9' | xargs gzip -nf





installmandocs: mandocs

installmandocs: mandocs
@@ -157,7 +150,7 @@ quiet_cmd_db2html = HTML $@ 
            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi

            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi





quiet_cmd_db2man = MAN     $@

quiet_cmd_db2man = MAN     $@

      cmd_db2man = if grep -q refentry $<; then xmlif excludeextra=1 <$< >$<.noextra && xmlto man $(XMLTOFLAGS) -o $(obj)/man $<.noextra ; fi

      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi

%.9 : %.xml

%.9 : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	 (echo "*** You need to install xmlto ***"; \
@@ -224,7 +217,6 @@ clean-files := $(DOCBOOKS) \ 
	$(patsubst %.xml, %.ps,   $(DOCBOOKS)) \

	$(patsubst %.xml, %.ps,   $(DOCBOOKS)) \

	$(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \

	$(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \

	$(patsubst %.xml, %.html, $(DOCBOOKS)) \

	$(patsubst %.xml, %.html, $(DOCBOOKS)) \

	$(patsubst %, %.noextra,  $(DOCBOOKS)) \

	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \

	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \

	$(index)

	$(index)

Documentation/DocBook/device-drivers.tmpl

+0 −6
Original line number Original line Diff line number Diff line
@@ -194,13 +194,8 @@ X!Edrivers/pnp/system.c 




  <chapter id="snddev">

  <chapter id="snddev">

     <title>Sound Devices</title>

     <title>Sound Devices</title>

<?xmlif if excludeextra='1'?>

<?xmlif else?>

!Iinclude/sound/core.h

!Iinclude/sound/core.h

<?xmlif fi?>

!Esound/sound_core.c

!Esound/sound_core.c

<?xmlif if excludeextra='1'?>

<?xmlif else?>

!Iinclude/sound/pcm.h

!Iinclude/sound/pcm.h

!Esound/core/pcm.c

!Esound/core/pcm.c

!Esound/core/device.c

!Esound/core/device.c
@@ -216,7 +211,6 @@ X!Edrivers/pnp/system.c 
!Esound/core/hwdep.c

!Esound/core/hwdep.c

!Esound/core/pcm_native.c

!Esound/core/pcm_native.c

!Esound/core/memalloc.c

!Esound/core/memalloc.c

<?xmlif fi?>

<!-- FIXME: Removed for now since no structured comments in source

<!-- FIXME: Removed for now since no structured comments in source

X!Isound/sound_firmware.c

X!Isound/sound_firmware.c

-->

-->

Documentation/DocBook/gadget.tmpl

+0 −3
Original line number Original line Diff line number Diff line
@@ -488,10 +488,7 @@ These are the same types and constants used by host 
side drivers (and usbcore).

side drivers (and usbcore).

</para>

</para>





<?xmlif if excludeextra='1'?>

<?xmlif else?>

!Iinclude/linux/usb/ch9.h

!Iinclude/linux/usb/ch9.h

<?xmlif fi?>

</sect1>

</sect1>





<sect1 id="core"><title>Core Objects and Methods</title>

<sect1 id="core"><title>Core Objects and Methods</title>

Documentation/DocBook/kernel-api.tmpl

+0 −6
Original line number Original line Diff line number Diff line
@@ -58,11 +58,8 @@ 




     <sect1><title>String Conversions</title>

     <sect1><title>String Conversions</title>

!Elib/vsprintf.c

!Elib/vsprintf.c

<?xmlif if excludeextra='1'?>

<?xmlif else?>

!Finclude/linux/kernel.h kstrtol

!Finclude/linux/kernel.h kstrtol

!Finclude/linux/kernel.h kstrtoul

!Finclude/linux/kernel.h kstrtoul

<?xmlif fi?>

!Elib/kstrtox.c

!Elib/kstrtox.c

     </sect1>

     </sect1>

     <sect1><title>String Manipulation</title>

     <sect1><title>String Manipulation</title>
@@ -181,10 +178,7 @@ X!Ekernel/module.c 
  <chapter id="hardware">

  <chapter id="hardware">

     <title>Hardware Interfaces</title>

     <title>Hardware Interfaces</title>

     <sect1><title>Interrupt Handling</title>

     <sect1><title>Interrupt Handling</title>

<?xmlif if excludeextra='1'?>

<?xmlif else?>

!Ekernel/irq/manage.c

!Ekernel/irq/manage.c

<?xmlif fi?>

     </sect1>

     </sect1>





     <sect1><title>DMA Channels</title>

     <sect1><title>DMA Channels</title>