[PATCH xserver 0/8] DocBook/XML make updates and refactoring

Gaetan Nadon memsize at videotron.ca
Thu Nov 11 04:59:36 PST 2010


Use the xorg.css from xorg-sgml-doctools
General makefile simplification
Refactoring of xmlrules reusable code

Tested with the following permutations of options:
--enable-builddocs --enable-docs --enable-devel-docs --with-xmlto
--enable-builddocs --disable-docs --enable-devel-docs --with-xmlto
--enable-builddocs --enable-docs --disable-devel-docs --with-xmlto
--enable-builddocs --enable-docs --enable-devel-docs --without-xmlto
--disable-builddocs --enable-docs --enable-devel-docs --with-xmlto


Gaetan Nadon (8):
  doc: HTML file generation: use the installed copy of xorg.css
  xmlrules.in: remove unrequired "@rm -f $@" from doc targets
  xmlrules.in: the searchpath only needed to locate entities
  xmlrules.in: no need to setup xmlto flags when configuring
    --without-xmlto
  xmlrules.in: use pattern rules to enable dependencies
  xmlrules.in: specify the xserver entities depedencies on the target
  xmlrules.in: use $(top_srcdir) rather than ../../../ [...]
  doc: refactor Makefile and xmlrules.in code for reusability

 doc/xml/.gitignore              |    1 -
 doc/xml/Makefile.am             |   11 ++-----
 doc/xml/dtrace/.gitignore       |    1 -
 doc/xml/dtrace/Makefile.am      |   16 +++++------
 doc/xml/xmlrules-inst.in        |   23 +++++++++++++++
 doc/xml/xmlrules-noinst.in      |   22 +++++++++++++++
 doc/xml/xmlrules.in             |   57 +++++++++------------------------------
 hw/dmx/doc/Makefile.am          |    8 ++---
 hw/xfree86/doc/sgml/Makefile.am |   10 ++-----
 9 files changed, 74 insertions(+), 75 deletions(-)
 create mode 100644 doc/xml/xmlrules-inst.in
 create mode 100644 doc/xml/xmlrules-noinst.in



More information about the xorg-devel mailing list