Generate attributions page and use it.

Fix dependencies for generating the HOWTO (should save doing 'make clean' every
time)
(This used to be commit b574685556fe977962f4d909825d23fce00b53d7)

3 files changed, 20 insertions, 12 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 4d90e2ba27..91a543826b 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -51,6 +51,9 @@ FAQDIR = ../faq
 MANPAGES=$(patsubst %,$(MANDIR)/%,$(MANPAGES_NAMES))
 MANPAGES_HTML=$(patsubst %,$(HTMLDIR)/%.html,$(MANPAGES_NAMES))
 
+PROJDOC_DEPS = $(PROJDOC)/*.xml $(PROJDOC)/attributions.xml
+DEVDOC_DEPS = $(DEVDOC)/*.xml
+
 all: 
 	@echo "Supported make targets:"
 	@echo "manpages - Build manpages"
@@ -81,29 +84,29 @@ htmlman: $(HTMLDIR) $(MANPAGES_HTML) CSS
 htmlfaq: $(HTMLDIR) CSS
 	@$(XSLTPROC) --stringparam base.dir "$(FAQDIR)/" --stringparam root.filename samba-faq xslt/html-chunk.xsl $(FAQPROJDOC)/sambafaq.xml
 html-single: $(HTMLDIR) CSS $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
-html: $(HTMLDIR) CSS
+html: $(HTMLDIR) CSS $(PROJDOC_DEPS)
 	@$(XSLTPROC) xslt/html-chunk.xsl $(PROJDOC)/samba-doc.xml
 
 # Text files
 $(TXTDIR):
 	mkdir $(TXTDIR)
 
-$(TXTDIR)/Samba-HOWTO-Collection.txt: $(PROJDOC)/samba-doc.xml
+$(TXTDIR)/Samba-HOWTO-Collection.txt: $(PROJDOC)/samba-doc.xml $(PROJDOC_DEPS)
 	@echo "Converting samba-doc to plain text..."
 	@$(XMLTO) txt -o $(TXTDIR) $<
 	@mv $(TXTDIR)/samba-doc.txt $(TXTDIR)/Samba-HOWTO-Collection.txt
 
-$(TXTDIR)/Samba-Developers-Guide.txt: $(DEVDOC)/dev-doc.xml
+$(TXTDIR)/Samba-Developers-Guide.txt: $(DEVDOC)/dev-doc.xml $(DEVDOC_DEPS)
 	@echo "Converting dev-doc to plain text..."
 	@$(XMLTO) txt -o $(TXTDIR) $<
 	@mv $(TXTDIR)/dev-doc.txt $(TXTDIR)/Samba-Developers-Guide.txt
 
 # Tex files
-samba-doc.tex: $(PROJDOC)/samba-doc.xml
+samba-doc.tex: $(PROJDOC)/samba-doc.xml $(PROJDOC_DEPS)
 	@echo "Converting samba-doc to LaTeX..."
 	@$(XSLTPROC) --output $@ xslt/latex.xsl $<
 	
-dev-doc.tex: $(DEVDOC)/dev-doc.xml
+dev-doc.tex: $(DEVDOC)/dev-doc.xml $(DEVDOC_DEPS)
 	@echo "Converting dev-doc to LaTeX..."
 	@$(XSLTPROC) --output $@ xslt/latex.xsl $<
 
@@ -156,10 +159,10 @@ $(HTMLDIR):
 CSS: $(HTMLDIR) xslt/html/samba.css
 	@cp xslt/html/samba.css $(HTMLDIR)/
 
-$(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.xml
+$(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.xml $(PROJDOC_DEPS)
 	@$(XSLTPROC) --output $@ xslt/html.xsl $<
 
-$(HTMLDIR)/Samba-Developers-Guide.html: $(DEVDOC)/dev-doc.xml
+$(HTMLDIR)/Samba-Developers-Guide.html: $(DEVDOC)/dev-doc.xml $(DEVDOC_DEPS)
 	@$(XSLTPROC) --output $@ xslt/html.xsl $<
 
 
@@ -193,6 +196,11 @@ $(MANPROJDOC)/smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/p
  			$(SMBDOTCONFDOC)/expand-smb.conf.xsl
 	@$(XSLTPROC) --xinclude --output $(MANPROJDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/expand-smb.conf.xsl $(SMBDOTCONFDOC)/smb.conf.5.xml
 
+$(PROJDOC)/attributions.xml: $(PROJDOC)/samba-doc.xml
+	@echo > $@ # Make sure we don't get recursive dependencies, etc!
+	@echo "Generating attributions page"
+	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+
 $(MANDIR): 
 	mkdir $(MANDIR)
 
@@ -202,5 +210,5 @@ $(MANDIR)/%: $(MANPROJDOC)/%.xml
 clean: 
 	@rm -f $(MANPAGES) $(MANPAGES_HTML) $(HTMLDIR)/*.html $(HTMLDIR)/*.css $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf 
 	@rm -f $(MANPROJDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.*.xml
-	@rm -f samba-doc.* dev-doc.*
+	@rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml
 
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index e5e18b72d6..f4d2156d68 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -507,6 +507,7 @@ an Active Directory environment.
 <!ENTITY pdb.xml SYSTEM "projdoc/pdb.xml.xml">
 <!ENTITY problems SYSTEM "projdoc/Problems.xml">
 <!ENTITY unicode SYSTEM "projdoc/unicode.xml">
+<!ENTITY attributions SYSTEM "projdoc/attributions.xml">
 
 <!ENTITY not.implemented "<note><para>Currently NOT implemented.</para></note>">
 <!ENTITY rootprompt "<prompt>root# </prompt>">
diff --git a/docs/docbook/projdoc/samba-doc.xml b/docs/docbook/projdoc/samba-doc.xml
index d6748844b9..bd4fa7db43 100644
--- a/docs/docbook/projdoc/samba-doc.xml
+++ b/docs/docbook/projdoc/samba-doc.xml
@@ -9,10 +9,6 @@
 
 <bookinfo>
 	<authorgroup>
-	<author>
-		<othername>SAMBA Team</othername>
-		<affiliation><address><email>samba@samba.org</email></address></affiliation>
-	</author>
 	<editor>&person.jelmer;</editor>
 	<editor>&person.jht;</editor>
 	<editor>&person.jerry;</editor>
@@ -50,6 +46,9 @@ version 2.  A copy of the license is included with the Samba source
 distribution.  A copy can be found on-line at <ulink 
 url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
 </para>
+
+&attributions;
+
 </legalnotice>
 </bookinfo>