svn commit: samba-docs r403 - in trunk: .
jelmer at samba.org
jelmer at samba.org
Fri Mar 11 16:26:19 GMT 2005
Author: jelmer
Date: 2005-03-11 16:26:19 +0000 (Fri, 11 Mar 2005)
New Revision: 403
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=403
Log:
Add texi support
Modified:
trunk/Makefile
trunk/Makefile.settings.in
trunk/configure.in
Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-03-11 15:57:45 UTC (rev 402)
+++ trunk/Makefile 2005-03-11 16:26:19 UTC (rev 403)
@@ -57,6 +57,8 @@
fo: $(patsubst $(DOCBOOKDIR)/%.xml,$(FODIR)/%.fo,$(MAIN_DOCS))
fo-pdf: $(patsubst $(DOCBOOKDIR)/%.xml,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
tex: $(patsubst $(DOCBOOKDIR)/%.xml,%.tex,$(MAIN_DOCS))
+texi: $(patsubst $(DOCBOOKDIR)/%.xml,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
+texiinfo: $(patsubst $(DOCBOOKDIR)/%.xml,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
manpages: $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES))
pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
@@ -104,19 +106,10 @@
$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
$(XSLTPROC) --output $@ xslt/html.xsl $<
+# Attributions
%-attributions.xml:
$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
-clobber: clean
- rm Makefile.settings settings.xsl config.status config.log configure
-
-clean:
- rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
- rm -f *.xml
- rm -f xslt/figures/*pdf
- rm -f $(SMBDOTCONFDOC)/parameters.*.xml
- rm -f $(patsubst $(DOCBOOKDIR)/%.xml,%.*,$(MAIN_DOCS))
-
# Text files
$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
mkdir -p $(@D)
@@ -172,10 +165,6 @@
xslt/figures/%.pdf: xslt/figures/%.eps
$(EPSTOPDF) $<
-# RTF files
-$(RTFDIR)/%.rtf: $(DOCBOOKDIR)/%.xml
- $(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
-
# Fo
$(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
mkdir -p $(@D)
@@ -196,6 +185,14 @@
mkdir -p $(@D)
$(PLUCKERBUILD) -v -V 2 --stayonhost --zlib-compression -f $* -p $(PLUCKERDIR) file:$<
+# Texinfo docs
+$(TEXINFODIR)/%.texi: $(DOCBOOKDIR)/%.xml
+ mkdir -p $(@D)
+ cd $(@D) && $(DB2TEXI) $(shell pwd)/$<
+
+$(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi
+ $(MAKEINFO) --no-validate --force -o $@ "$<"
+
# Manpages
$(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
@@ -220,7 +217,6 @@
$(XSLTPROC) --output $@ xslt/smb.conf-html.xsl $<
# Pearson compatible XML
-
$(PEARSONDIR)/%.xml: %/index.xml xslt/pearson.xsl
mkdir -p $(@D)
$(XSLTPROC) --xinclude --output $@ xslt/sambadoc2pearson.xsl $<
@@ -230,7 +226,6 @@
$(XMLLINT) --valid --noout --htmlout $< 2> $@
# Validation verification
-
$(VALIDATEDIR)/%.report.html: %/index.xml
mkdir -p $(@D)
$(XMLLINT) --xinclude --postvalid --noout --htmlout $< 2> $@
@@ -238,13 +233,11 @@
validate: $(VALIDATEDIR)/Samba-HOWTO-Collection.report.html $(VALIDATEDIR)/Samba-Developers-Guide.report.html $(VALIDATEDIR)/Samba-Guide.report.html
# Find undocumented parameters
-
undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl
@$(PERL) scripts/find_missing_doc.pl $(SRCDIR)
@$(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
# Examples and the like
-
files: Samba-HOWTO-Collection/index.xml xslt/extract-smbfiles.xsl
$(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
@@ -268,4 +261,15 @@
xslt/man.xsl:
xslt/pearson.xsl:
+clobber: clean
+ rm Makefile.settings settings.xsl config.status config.log configure
+
+clean:
+ rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
+ rm -f *.xml
+ rm -f xslt/figures/*pdf
+ rm -f $(SMBDOTCONFDOC)/parameters.*.xml
+ rm -f $(patsubst $(DOCBOOKDIR)/%.xml,%.*,$(MAIN_DOCS))
+
+# Always keep intermediate files if we can
.SECONDARY:
Modified: trunk/Makefile.settings.in
===================================================================
--- trunk/Makefile.settings.in 2005-03-11 15:57:45 UTC (rev 402)
+++ trunk/Makefile.settings.in 2005-03-11 16:26:19 UTC (rev 403)
@@ -8,6 +8,8 @@
DIA = @DIA@
PNMTOPS = @PNMTOPS@
HTML2TEXT = @HTML2TEXT@
+DB2TEXI = @DB2TEXI@
+MAKEINFO = @MAKEINFO@
PLUCKERBUILD = @PLUCKERBUILD@
COPY_IMAGES = ./scripts/copy-images.sh
THUMBPDF = @THUMBPDF@
@@ -24,6 +26,7 @@
# Paths
OUTPUTDIR = output
ARCHIVEDIR = archive
+TEXINFODIR = $(OUTPUTDIR)/texi
SRCDIR = @SAMBASOURCEDIR@
MANDIR = $(OUTPUTDIR)/manpages
EPSTOPDF = @EPSTOPDF@
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-03-11 15:57:45 UTC (rev 402)
+++ trunk/configure.in 2005-03-11 16:26:19 UTC (rev 403)
@@ -68,6 +68,8 @@
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VERIFY)
DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
+DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI)
+DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO)
DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR $SPECIFIED_SOURCEDIR/source ..], [param/loadparm.c], SAMBASOURCEDIR, UNDOCUMENTED)
AC_MSG_RESULT([])
@@ -86,6 +88,8 @@
DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
DOCS_DEFINE_TARGET(VERIFY, ALL, [verifying docbook output], [verify])
DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fopdf])
+DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi])
+DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo])
DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented])
DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt])
More information about the samba-cvs
mailing list