From ad0e01e75059bedde6400529f1a5193ef9735e9b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 25 Oct 2002 15:15:32 +0000
Subject: sync from HEAD (This used to be commit
 2eb7f0acd761a11bb0f24010347247074c5ed49a)

---
 docs/docbook/Makefile.in | 87 ++++++++++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 33 deletions(-)

(limited to 'docs/docbook/Makefile.in')

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index c79c9008ff..1ac71e452b 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -38,9 +38,15 @@ HTMLDOC = @HTMLDOC@
 SRCDIR = @srcdir@
 MANDIR=../manpages
 HTMLDIR=../htmldocs
-MANSGMLDIR = manpages/
-SGMLDIR = projdoc/
+MANPROJDOC = manpages/
+PROJDOC = projdoc/
+DEVDOC = devdoc/
 PERL = @PERL@
+PSDIR = ..
+PDFDIR = ..
+TXTDIR = ../textdocs
+FAQPROJDOC = faq/
+FAQDIR = ../faq
 
 MANPAGES=$(patsubst %,$(MANDIR)/%,$(MANPAGES_NAMES))
 MANPAGES_HTML=$(patsubst %,$(HTMLDIR)/%.html,$(MANPAGES_NAMES))
@@ -55,55 +61,70 @@ all:
 	@echo "html - Build HTML version of HOWTO Collection"
 	@echo "htmlman - Build html version of manpages"
 	@echo "txt - Build plain text version of HOWTO Collection"
+	@echo "htmlfaq - Build html version of the FAQ"
+	@echo "everything - Build all of the above"
+
+everything: manpages ps pdf html-single html htmlman txt htmlfaq
+
+# Global rules
 
 manpages: $(MANPAGES)
-pdf: ../Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf
-ps: ../Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps
-txt: ../textdocs/Samba-HOWTO-Collection.txt ../textdocs/Samba-Developers-Guide.txt
+pdf: $(PDFDIR)/Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf
+ps: $(PSDIR)/Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps
+txt: $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
 htmlman:  $(MANPAGES_HTML)
-html-single: ../$(HTMLDIR)/Samba-HOWTO-Collection.html  ../$(HTMLDIR)/Samba-Developers-Guide.html
+htmlfaq: 
+	$(DOCBOOK2HTML) -d samba.dsl -o $(FAQDIR) $(FAQPROJDOC)/sambafaq.sgml
+html-single: $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
 html:
-	$(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) projdoc/samba-doc.sgml
+	$(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) $(PROJDOC)/samba-doc.sgml
+
+# Text files
 
-../Samba-HOWTO-Collection.txt: $(SGMLDIR)/samba-doc.sgml
-	$(DOCBOOK2TXT) -o .. $<
-	mv ../samba-doc.txt $@
+$(TXTDIR)/Samba-HOWTO-Collection.txt: $(PROJDOC)/samba-doc.sgml
+	$(DOCBOOK2TXT) -o . $<
+	mv ./samba-doc.txt $@
 
-../Samba-Developers-Guide.txt: $(SGMLDIR)/samba-doc.sgml
-	$(DOCBOOK2TXT) -o .. $<
-	mv ../samba-doc.txt $@
+$(TXTDIR)/Samba-Developers-Guide.txt: $(PROJDOC)/samba-doc.sgml
+	$(DOCBOOK2TXT) -o . $<
+	mv ./samba-doc.txt $@
 
-../Samba-HOWTO-Collection.ps: $(SGMLDIR)/samba-doc.sgml
-	$(DOCBOOK2PS) -o .. $<
-	mv ../samba-doc.ps $@
+# PostScript
 
-../Samba-Developers-Guide.ps: $(SGMLDIR)/samba-doc.sgml
-	$(DOCBOOK2PS) -o .. $<
-	mv ../samba-doc.ps $@
+$(PSDIR)/Samba-HOWTO-Collection.ps: $(PROJDOC)/samba-doc.sgml
+	$(DOCBOOK2PS) -o . $<
+	mv ./samba-doc.ps $@
 
-../Samba-HOWTO-Collection.pdf: ../$(HTMLDIR)/Samba-HOWTO-Collection.html
+$(PSDIR)/Samba-Developers-Guide.ps: $(PROJDOC)/samba-doc.sgml
+	$(DOCBOOK2PS) -o . $<
+	mv ./samba-doc.ps $@
+
+# Adobe PDF files
+
+$(PDFDIR)/Samba-HOWTO-Collection.pdf: $(HTMLDIR)/Samba-HOWTO-Collection.html
 	$(HTMLDOC) --book --color --links -f $@ $<
 
-../Samba-Developers-Guide.pdf: ../$(HTMLDIR)/Samba-Developers-Guide.html
+$(PDFDIR)/Samba-Developers-Guide.pdf: $(HTMLDIR)/Samba-Developers-Guide.html
 	$(HTMLDOC) --book --color --links -f $@ $<
 
-../$(HTMLDIR)/Samba-HOWTO-Collection.html: $(SGMLDIR)/samba-doc.sgml
-	$(DOCBOOK2HTML) -u -o .. $<
-	mv ../samba-doc.html $@
+# Single large HTML files
+
+$(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.sgml
+	$(DOCBOOK2HTML) -u -o . $<
+	mv ./samba-doc.html $@
 
-../$(HTMLDIR)/Samba-Developers-Guide.html: devdoc/dev-doc.sgml
-	$(DOCBOOK2HTML) -u -o .. $<
-	mv ../dev-doc.html $@
+$(HTMLDIR)/Samba-Developers-Guide.html: $(DEVDOC)/dev-doc.sgml
+	$(DOCBOOK2HTML) -u -o . $<
+	mv ./dev-doc.html $@
 
 
-$(HTMLDIR)/%.html: $(MANSGMLDIR)/%.sgml
-	$(DOCBOOK2HTML) -o $(HTMLDIR) $<
-	mv $(HTMLDIR)/index.html $@
+$(HTMLDIR)/%.html: $(MANPROJDOC)/%.sgml
+	$(DOCBOOK2HTML) -u -o $(HTMLDIR) $<
 
-$(MANDIR)/%: $(MANSGMLDIR)/%.sgml 
-	$(DOCBOOK2MAN) -o $(MANDIR) $<
+$(MANDIR)/%: $(MANPROJDOC)/%.sgml 
+	$(DOCBOOK2MAN) -o $(MANDIR) $< || rm $@
 	$(PERL) scripts/strip-links.pl < $@ > $@.temp
 	mv $@.temp $@
 
 clean: 
-	rm -f $(MANPAGES) $(MANPAGES_HTML) ../$(HTMLDIR)/*.html ../Samba-HOWTO-Collection.p* ../Samba-Developers-Guide.p*
+	rm -f $(MANPAGES) $(MANPAGES_HTML) $(HTMLDIR)/*.html $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf
-- 
cgit