(With patch) Documentation build changes (try 4)

Vincent Béron vberon at mecano.gme.usherb.ca
Wed Nov 20 18:32:29 CST 2002


This time with the patch attached (big sigh)...

Removed some of the detailed targets as Alexandre asked.

configure must be rebuilt after (I only have autoconf 2.53, and the CVS
configure has been made by autoconf 2.54).

Changelog:
The default behavior of "make everything" is now to build separate
guides rather than the big one.
Determines the name of the installed docbook filter (db2html or
docbook2html, etc.) in configure, defaulting to false if absent.

Vincent
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.94
diff -u -r1.94 configure.ac
--- configure.ac	12 Nov 2002 23:21:55 -0000	1.94
+++ configure.ac	14 Nov 2002 17:14:40 -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	14 Nov 2002 17:14:41 -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	14 Nov 2002 17:14:41 -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,26 +71,64 @@
 	$(BOOKNAME).pdf \
 	$(BOOKNAME).ps
 
+BOOKS_TARGETS = \
+	$(BOOKSNAMES:%=%/index.html) \
+	$(BOOKSNAMES:%=%.pdf) \
+	$(BOOKSNAMES:%=%.ps)
+
 all: $(MAN_TARGETS)
 
 @MAKE_RULES@
 
-everything: $(MAN_TARGETS) $(BOOK_TARGETS)
-doc: $(BOOK_TARGETS)
-html: $(BOOKNAME)/index.html
-pdf: $(BOOKNAME).pdf
-ps: $(BOOKNAME).ps
+everything: $(MAN_TARGETS) $(BOOKS_TARGETS)
+doc: $(BOOKS_TARGETS)
+html: $(BOOKSNAMES:%=%/index.html)
+pdf: $(BOOKSNAMES:%=%.pdf)
+ps: $(BOOKSNAMES:%=%.ps)
+$(BOOKNAME): $(BOOK_TARGETS)
 
-.PHONY: everything doc html pdf ps
+.PHONY: everything doc html pdf ps $(BOOKNAME)
+
+.SUFFIXES: .sgml /index.html .pdf .ps
+
+.sgml/index.html:
+	$(DB2HTML) -d default.dsl -o $(@:%/index.html=%) $(@:%/index.html=%).sgml
+
+.sgml.pdf:
+	$(DB2PDF) -d print.dsl $(@:%.pdf=%).sgml > /dev/null
+
+.sgml.ps:
+	$(DB2PS) $(@:%.ps=%).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_USER_NAME).pdf: $(WINE_USER_SRCS) $(WINE_USER_NAME).sgml
+
+$(WINE_USER_NAME).ps: $(WINE_USER_SRCS) $(WINE_USER_NAME).sgml
+
+$(WINE_DEVEL_NAME)/index.html: $(WINE_DEVEL_SRCS) $(WINE_DEVEL_NAME).sgml
+
+$(WINE_DEVEL_NAME).pdf: $(WINE_DEVEL_SRCS) $(WINE_DEVEL_NAME).sgml
+
+$(WINE_DEVEL_NAME).ps: $(WINE_DEVEL_SRCS) $(WINE_DEVEL_NAME).sgml
+
+$(WINELIB_USER_NAME)/index.html: $(WINELIB_USER_SRCS) $(WINELIB_USER_NAME).sgml
+
+$(WINELIB_USER_NAME).pdf: $(WINELIB_USER_SRCS) $(WINELIB_USER_NAME).sgml
+
+$(WINELIB_USER_NAME).ps: $(WINELIB_USER_SRCS) $(WINELIB_USER_NAME).sgml
+
+$(WINE_PKG_NAME)/index.html: $(WINE_PKG_SRCS) $(WINE_PKG_NAME).sgml
+
+$(WINE_PKG_NAME).pdf: $(WINE_PKG_SRCS) $(WINE_PKG_NAME).sgml
+
+$(WINE_PKG_NAME).ps: $(WINE_PKG_SRCS) $(WINE_PKG_NAME).sgml
 
 wine.man: wine.man.in
 	sed -e 's, at bindir\@,$(bindir),g' -e 's, at dlldir\@,$(dlldir),g' -e 's, at PACKAGE_STRING\@, at PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || $(RM) $@
@@ -86,7 +143,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:


More information about the wine-patches mailing list