frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sgml docs build.

This commit is contained in:
Kevin E Martin 2005-12-09 03:02:21 +00:00
parent d6f98cbdb8
commit 26b41ff439
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
* hw/dmx/doc/Makefile.am:
* hw/xfree86/doc/sgml/Makefile.am:
Fix sgml docs build.
2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> 2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac: * configure.ac:

9
configure.ac
View File

@ -449,11 +449,10 @@ fi
dnl Handle building documentation dnl Handle building documentation
AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes) AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
if test "x$BUILDDOCS" = xyes; then
dnl Only build sgml docs when linuxdoc is available dnl Only build sgml docs when linuxdoc is available and
AC_PATH_PROG(LINUXDOC, linuxdoc) dnl def.ents has been installed
fi XORG_CHECK_LINUXDOC
AM_CONDITIONAL(BUILDSGMLDOCS, test "x$LINUXDOC" != x)
dnl Handle installing libxf86config dnl Handle installing libxf86config
AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes]) AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])

14
hw/dmx/doc/Makefile.am
View File

@ -21,29 +21,31 @@
SGML_FILES = dmx.sgml scaled.sgml SGML_FILES = dmx.sgml scaled.sgml
if BUILD_LINUXDOC
TXT_FILES = $(SGML_FILES:%.sgml=%.txt) TXT_FILES = $(SGML_FILES:%.sgml=%.txt)
PS_FILES = $(SGML_FILES:%.sgml=%.ps) PS_FILES = $(SGML_FILES:%.sgml=%.ps)
if BUILD_PDFDOC
PDF_FILES = $(SGML_FILES:%.sgml=%.pdf) PDF_FILES = $(SGML_FILES:%.sgml=%.pdf)
endif
HTML_FILES = $(SGML_FILES:%.sgml=%.html) HTML_FILES = $(SGML_FILES:%.sgml=%.html)
SUFFIXES = .sgml .txt .html .ps .pdf SUFFIXES = .sgml .txt .html .ps .pdf
if BUILDSGMLDOCS
.sgml.txt: .sgml.txt:
@rm -f $@ @rm -f $@
GROFF_NO_SGR= $(LINUXDOC) -B txt $^ $(MAKE_TEXT) $<
.sgml.ps: .sgml.ps:
@rm -f $@ @rm -f $@
$(LINUXDOC) -B latex --papersize=letter --output=ps $^ $(MAKE_PS) $<
.sgml.pdf: .ps.pdf:
@rm -f $@ @rm -f $@
$(LINUXDOC) -B latex --papersize=letter --output=pdf $^ $(MAKE_PDF) $<
.sgml.html: .sgml.html:
@rm -f $@ @rm -f $@
$(LINUXDOC) -B html --split=0 $^ $(MAKE_HTML) $<
noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)

14
hw/xfree86/doc/sgml/Makefile.am
View File

@ -21,29 +21,31 @@
SGML_FILES = DESIGN.sgml SGML_FILES = DESIGN.sgml
if BUILD_LINUXDOC
TXT_FILES = $(SGML_FILES:%.sgml=%.txt) TXT_FILES = $(SGML_FILES:%.sgml=%.txt)
PS_FILES = $(SGML_FILES:%.sgml=%.ps) PS_FILES = $(SGML_FILES:%.sgml=%.ps)
if BUILD_PDFDOC
PDF_FILES = $(SGML_FILES:%.sgml=%.pdf) PDF_FILES = $(SGML_FILES:%.sgml=%.pdf)
endif
HTML_FILES = $(SGML_FILES:%.sgml=%.html) HTML_FILES = $(SGML_FILES:%.sgml=%.html)
SUFFIXES = .sgml .txt .html .ps .pdf SUFFIXES = .sgml .txt .html .ps .pdf
if BUILDSGMLDOCS
.sgml.txt: .sgml.txt:
@rm -f $@ @rm -f $@
GROFF_NO_SGR= $(LINUXDOC) -B txt $^ $(MAKE_TEXT) $<
.sgml.ps: .sgml.ps:
@rm -f $@ @rm -f $@
$(LINUXDOC) -B latex --papersize=letter --output=ps $^ $(MAKE_PS) $<
.sgml.pdf: .ps.pdf:
@rm -f $@ @rm -f $@
$(LINUXDOC) -B latex --papersize=letter --output=pdf $^ $(MAKE_PDF) $<
.sgml.html: .sgml.html:
@rm -f $@ @rm -f $@
$(LINUXDOC) -B html --split=0 $^ $(MAKE_HTML) $<
noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)