This replaces the previous patch ("Accept any db2html/docbook2html",
db2-all.diff).
Changelog:
Allows the building of separate guides rather than only the big one.
Determines the name of the installed docbook filter (db2html or
docbook2html, etc.) in configure, defaulting to false if absent.
Vincent
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.90
diff -u -r1.90 configure.ac
--- configure.ac 8 Nov 2002 19:34:52 -0000 1.90
+++ configure.ac 10 Nov 2002 18:56:16 -0000
@@ -101,6 +101,18 @@
AC_SUBST(LINT)
AC_SUBST(LINTFLAGS)
+dnl Check for db2html
+AC_CHECK_PROGS(DB2HTML, docbook2html db2html, false)
+AC_SUBST(DB2HTML)
+
+dnl Check for db2pdf
+AC_CHECK_PROGS(DB2PDF, docbook2pdf db2pdf, false)
+AC_SUBST(DB2PDF)
+
+dnl Check for db2ps
+AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
+AC_SUBST(DB2PS)
+
dnl **** Check for some libraries ****
dnl Check for -lm
Index: documentation/.cvsignore
===================================================================
RCS file: /home/wine/wine/documentation/.cvsignore,v
retrieving revision 1.7
diff -u -r1.7 .cvsignore
--- documentation/.cvsignore 14 Feb 2002 19:47:31 -0000 1.7
+++ documentation/.cvsignore 10 Nov 2002 18:56:17 -0000
@@ -4,10 +4,14 @@
*.log
*.out
*.tex
+*.pdf
+*.ps
DBTOHTML_OUTPUT_DIR*
Makefile
wine-doc
-wine-doc.pdf
-wine-doc.ps
wine-doc.rtf
+wine-user
+wine-devel
+winelib-user
+wine-pkg
wine.man
Index: documentation/Makefile.in
===================================================================
RCS file: /home/wine/wine/documentation/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- documentation/Makefile.in 17 Sep 2002 18:44:46 -0000 1.24
+++ documentation/Makefile.in 10 Nov 2002 18:56:17 -0000
@@ -4,46 +4,65 @@
VPATH = @srcdir@
MODULE = none
BOOKNAME = wine-doc
-DB2HTML = db2html
+WINE_USER_NAME = wine-user
+WINE_DEVEL_NAME = wine-devel
+WINELIB_USER_NAME = winelib-user
+WINE_PKG_NAME = wine-pkg
+BOOKSNAMES = $(WINE_USER_NAME) $(WINE_DEVEL_NAME) $(WINELIB_USER_NAME) $(WINE_PKG_NAME)
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
EXTRASUBDIRS = samples status
-BOOK_SRCS = \
- architecture.sgml \
- bugs.sgml \
- build.sgml \
- compiling.sgml \
+WINE_USER_SRCS = \
+ introduction.sgml \
+ getting.sgml \
+ installing.sgml \
configuring.sgml \
- consoles.sgml \
- cvs-regression.sgml \
- debugger.sgml \
+ registry.sgml \
+ fonts.sgml \
+ printing.sgml \
+ running.sgml \
+ bugs.sgml
+
+WINE_DEVEL_SRCS = \
+ compiling.sgml \
debugging.sgml \
- dlls.sgml \
documentation.sgml \
- fonts.sgml \
- getting.sgml \
+ testing.sgml \
+ patches.sgml \
i18n.sgml \
- implementation.sgml \
- installing.sgml \
- introduction.sgml \
+ porting.sgml \
+ architecture.sgml \
ole.sgml \
+ debugger.sgml \
+ consoles.sgml \
+ implementation.sgml \
opengl.sgml \
- packaging.sgml \
- patches.sgml \
- porting.sgml \
- printing.sgml \
- registry.sgml \
- running.sgml \
- testing.sgml \
+ build.sgml \
tools.sgml \
- wine-doc.sgml \
- winelib-bindlls.sgml \
+ dlls.sgml \
+ cvs-regression.sgml \
+ multimedia.sgml
+
+WINELIB_USER_SRCS = \
winelib-intro.sgml \
- winelib-mfc.sgml \
- winelib-pkg.sgml \
winelib-porting.sgml \
winelib-toolkit.sgml \
- winelib-user.sgml
+ winelib-mfc.sgml \
+ winelib-bindlls.sgml \
+ winelib-pkg.sgml
+
+WINE_PKG_SRCS = \
+ packaging.sgml
+
+BOOK_SRCS = \
+ wine-doc.sgml \
+ $(WINE_USER_SRCS) \
+ $(WINE_DEVEL_SRCS) \
+ $(WINELIB_USER_SRCS) \
+ $(WINE_PKG_SRCS)
MAN_TARGETS = wine.man
@@ -52,6 +71,11 @@
$(BOOKNAME).pdf \
$(BOOKNAME).ps
+BOOKS_TARGETS = \
+ $(addsuffix /index.html, $(BOOKSNAMES)) \
+ $(addsuffix .pdf, $(BOOKSNAMES)) \
+ $(addsuffix .ps, $(BOOKSNAMES))
+
all: $(MAN_TARGETS)
@MAKE_RULES@
@@ -61,17 +85,53 @@
html: $(BOOKNAME)/index.html
pdf: $(BOOKNAME).pdf
ps: $(BOOKNAME).ps
+allseparate: $(BOOKS_TARGETS)
+allseparatehtml: $(addsuffix /index.html, $(BOOKSNAMES))
+allseparatepdf: $(addsuffix .pdf, $(BOOKSNAMES))
+allseparateps: $(addsuffix .ps, $(BOOKSNAMES))
-.PHONY: everything doc html pdf ps
+.PHONY: everything doc html pdf ps allseparate allseparatehtml allseparatepdf allseparateps
+
+.SUFFIXES: .sgml /index.html .pdf .ps
+
+.sgml/index.html:
+ $(DB2HTML) -d default.dsl -o $(subst /,,$(dir $@)) $(subst /,,$(dir $@)).sgml
+
+.sgml.pdf:
+ $(DB2PDF) -d print.dsl $(basename $@).sgml > /dev/null
+
+.sgml.ps:
+ $(DB2PS) $(basename $@).sgml > /dev/null
$(BOOKNAME)/index.html: $(BOOK_SRCS)
- $(DB2HTML) $(BOOKNAME).sgml
$(BOOKNAME).pdf: $(BOOK_SRCS)
- db2pdf -d ./print.dsl $(BOOKNAME).sgml > /dev/null
$(BOOKNAME).ps: $(BOOK_SRCS)
- db2ps $(BOOKNAME).sgml > /dev/null
+
+$(WINE_USER_NAME)/index.html: $(WINE_USER_SRCS) $(WINE_USER_NAME).sgml
+
+$(WINE_DEVEL_NAME)/index.html: $(WINE_DEVEL_SRCS) $(WINE_DEVEL_NAME).sgml
+
+$(WINELIB_USER_NAME)/index.html: $(WINELIB_USER_SRCS) $(WINELIB_USER_NAME).sgml
+
+$(WINE_PKG_NAME)/index.html: $(WINE_PKG_SRCS) $(WINE_PKG_NAME).sgml
+
+$(WINE_USER_NAME).pdf: $(WINE_USER_SRCS) $(WINE_USER_NAME).sgml
+
+$(WINE_DEVEL_NAME).pdf: $(WINE_DEVEL_SRCS) $(WINE_DEVEL_NAME).sgml
+
+$(WINELIB_USER_NAME).pdf: $(WINELIB_USER_SRCS) $(WINELIB_USER_NAME).sgml
+
+$(WINE_PKG_NAME).pdf: $(WINE_PKG_SRCS) $(WINE_PKG_NAME).sgml
+
+$(WINE_USER_NAME).ps: $(WINE_USER_SRCS) $(WINE_USER_NAME).sgml
+
+$(WINE_DEVEL_NAME).ps: $(WINE_DEVEL_SRCS) $(WINE_DEVEL_NAME).sgml
+
+$(WINELIB_USER_NAME).ps: $(WINELIB_USER_SRCS) $(WINELIB_USER_NAME).sgml
+
+$(WINE_PKG_NAME).ps: $(WINE_PKG_SRCS) $(WINE_PKG_NAME).sgml
wine.man: wine.man.in
sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || $(RM) $@
@@ -86,7 +146,7 @@
$(RM) $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
clean::
- $(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps $(MAN_TARGETS)
- $(RM) -r $(BOOKNAME) html man3w *.junk DBTOHTML_OUTPUT_DIR*
+ $(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps $(addsuffix .pdf, $(BOOKSNAMES)) $(addsuffix .ps, $(BOOKSNAMES)) $(MAN_TARGETS)
+ $(RM) -r $(BOOKNAME) $(BOOKSNAMES) html man3w *.junk DBTOHTML_OUTPUT_DIR*
### Dependencies:
