[WINEDOCS] Move things to Make.rules.in

[Francois Gouget]

Since most of the changes that were in my previous 'translation 
infrastructure' patch are pretty much all in just three files they are 
pretty intertwined. So I'll wait until this part is sorted out/committed 
before I submit the rest.

Changelog:

  * Make.rules.in
    en/Makefile.in

    Francois Gouget <fgouget at codeweavers.com>
    Move the DB2xxx variables to Make.rules.in. That's where they are 
used anyway.
    Move the documentation tarball rules to Make.rules.in.
    Remove unneeded items in the clean rule.
    Add some comment lines to separate each section of Make.rules.in.
    Add the list of variables Makefiles must define before including 
Make.rules.

-- 
Francois Gouget
fgouget at codeweavers.com

-------------- next part --------------
Index: Make.rules.in
===================================================================
RCS file: /cvsroot/wine/docs/Make.rules.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Make.rules.in
--- Make.rules.in	9 May 2005 05:31:08 -0000	1.1.1.1
+++ Make.rules.in	13 May 2005 10:31:17 -0000
@@ -1,13 +1,23 @@
 # Global rules shared by all makefiles     -*-Makefile-*-
+#
+# Each individual makefile should define the following variables:
+# LANG         : the language for the documentation
+# ALLBOOKS     : the books to build
 
 SHELL     = /bin/sh
 LN        = @LN@
 LN_S      = @LN_S@
 RM        = rm -f
 MV        = mv
+DB2HTML   = @DB2HTML@
+DB2PDF    = @DB2PDF@
+DB2PS     = @DB2PS@
+DB2TXT    = @DB2TXT@
 
 .PHONY: doc html pdf ps txt dist
 
+# Rules for generating the documentation from the SGML sources
+
 .SUFFIXES: .sgml .html .pdf .ps .txt
 
 .sgml.html:
@@ -23,9 +33,27 @@ MV        = mv
 	$(DB2TXT) $<
 
 clean:: $(SUBDIRS:%=%/__clean__) 
-	$(RM) *.aux *.dvi *.out *.tex *.log wine-doc-*.tar.gz wine-faq.html wine-faq.txt $(MAN_TARGETS)
+	$(RM) *.aux *.dvi *.out *.tex *.log wine-doc-*.tar.gz
 	$(RM) $(ALLBOOKS:%=%.ps) $(ALLBOOKS:%=%.pdf) $(ALLBOOKS:%=%.html) $(ALLBOOKS:%=%.txt)
-	$(RM) -r html api-guide man$(api_manext) *.junk DBTOHTML_OUTPUT_DIR*
+	$(RM) -r *.junk DBTOHTML_OUTPUT_DIR*
+
+# Rules for distribution tarballs of formatted docs
+
+dist: wine-doc-$(LANG)-ps.tar.gz wine-doc-$(LANG)-pdf.tar.gz wine-doc-$(LANG)-html.tar.gz wine-doc-$(LANG)-txt.tar.gz
+
+wine-doc-$(LANG)-ps.tar.gz: $(ALLBOOKS:%=%.ps)
+	tar cf - $(ALLBOOKS:%=%.ps) | gzip -9 > $@ || ($(RM) $@ && false)
+
+wine-doc-$(LANG)-pdf.tar.gz: $(ALLBOOKS:%=%.pdf)
+	tar cf - $(ALLBOOKS:%=%.pdf) | gzip -9 > $@ || ($(RM) $@ && false)
+
+wine-doc-$(LANG)-html.tar.gz: $(ALLBOOKS:%=%.html)
+	tar cf - $(ALLBOOKS:%=%.html) | gzip -9 > $@ || ($(RM) $@ && false)
+
+wine-doc-$(LANG)-txt.tar.gz: $(ALLBOOKS:%=%.txt)
+	tar cf - $(ALLBOOKS:%=%.txt) | gzip -9 > $@ || ($(RM) $@ && false)
+
+# Directory recursion
 
 $(SUBDIRS:%=%/__clean__): dummy
 	cd `dirname $@` && $(MAKE) clean
Index: en/Makefile.in
===================================================================
RCS file: /cvsroot/wine/docs/en/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.in
--- en/Makefile.in	9 May 2005 05:31:14 -0000	1.1.1.1
+++ en/Makefile.in	13 May 2005 10:31:17 -0000
@@ -1,8 +1,4 @@
 LANG      = en
-DB2HTML   = @DB2HTML@
-DB2PDF    = @DB2PDF@
-DB2PS     = @DB2PS@
-DB2TXT    = @DB2TXT@
 
 WINEUSR_SRCS = \
 	wineusr-bugs.sgml \
@@ -57,20 +53,3 @@ txt: $(ALLBOOKS:%=%.txt)
 winedev-guide.pdf winedev-guide.ps winedev-guide.html winedev-guide.txt: $(WINEDEV_SRCS)
 wineusr-guide.pdf wineusr-guide.ps wineusr-guide.html wineusr-guide.txt: $(WINEUSR_SRCS)
 winelib-guide.pdf winelib-guide.ps winelib-guide.html winelib-guide.txt: $(WINELIB_SRCS)
-
-# Rules for distribution tarballs of formatted docs
-
-dist: wine-doc-$(LANG)-ps.tar.gz wine-doc-$(LANG)-pdf.tar.gz wine-doc-$(LANG)-html.tar.gz wine-doc-$(LANG)-txt.tar.gz
-
-wine-doc-$(LANG)-ps.tar.gz: $(ALLBOOKS:%=%.ps)
-	tar cf - $(ALLBOOKS:%=%.ps) | gzip -9 > $@ || ($(RM) $@ && false)
-
-wine-doc-$(LANG)-pdf.tar.gz: $(ALLBOOKS:%=%.pdf)
-	tar cf - $(ALLBOOKS:%=%.pdf) | gzip -9 > $@ || ($(RM) $@ && false)
-
-wine-doc-$(LANG)-html.tar.gz: $(ALLBOOKS:%=%.html)
-	tar cf - $(ALLBOOKS:%=%.html) | gzip -9 > $@ || ($(RM) $@ && false)
-
-wine-doc-$(LANG)-txt.tar.gz: $(ALLBOOKS:%=%.txt)
-	tar cf - $(ALLBOOKS:%=%.txt) | gzip -9 > $@ || ($(RM) $@ && false)
-