The branch, master has been updated
via aebb1b8d7c1faef0ee36d9989d2c76607c8c5dd5 (commit)
via 0163f7ee8be167e353bee725dc3595f8d4c0d58f (commit)
via fada9e915a19e95ccde68516fe57d1d260da739c (commit)
via c4493c22f129b2c94f361e6f8657adc7cd2dc1c6 (commit)
via 86a968b0980011ed307b81fbc0734ba618d64c90 (commit)
from 6ca4d727c4cb7215b059166682e762c8294deafb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit aebb1b8d7c1faef0ee36d9989d2c76607c8c5dd5
Author: Jelmer Vernooij <[email protected]>
Date: Sat May 2 01:10:20 2009 +0200
Fix dependency on the attributes file.
commit 0163f7ee8be167e353bee725dc3595f8d4c0d58f
Author: Jelmer Vernooij <[email protected]>
Date: Sat May 2 00:39:49 2009 +0200
Remove unused entries from clean.
commit fada9e915a19e95ccde68516fe57d1d260da739c
Author: Jelmer Vernooij <[email protected]>
Date: Fri May 1 23:53:27 2009 +0200
Remove rules for unused epstopdf.
commit c4493c22f129b2c94f361e6f8657adc7cd2dc1c6
Author: Jelmer Vernooij <[email protected]>
Date: Fri May 1 23:50:49 2009 +0200
Remove XSLT script to generate image dependencies, instead rely on make
given that the number of image formats we use is limited.
commit 86a968b0980011ed307b81fbc0734ba618d64c90
Author: Jelmer Vernooij <[email protected]>
Date: Fri May 1 23:10:59 2009 +0200
Remove text chunks support. Was never built by any of the main targets,
and one of the reasons the complex dependency system exists.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 85 ++++++++----------------------
docs-xml/Makefile.settings.in | 1 -
docs-xml/configure.ac | 1 -
docs-xml/xslt/generate-dependencies.xsl | 55 --------------------
4 files changed, 23 insertions(+), 119 deletions(-)
delete mode 100644 docs-xml/xslt/generate-dependencies.xsl
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 6889030..717d067 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -40,11 +40,11 @@ help:
@echo " undocumented - Output list of undocumented smb.conf options"
@echo " samples - Extract examples"
-$(DOCBOOKDIR)/Samba3-ByExample.xml: $(filter-out
Samba3-ByExample/index.xml,$(wildcard Samba3-ByExample/*.xml))
-$(DOCBOOKDIR)/Samba3-HOWTO.xml: $(filter-out Samba3-HOWTO/index.xml,$(wildcard
Samba3-HOWTO/*.xml)) Samba3-HOWTO-attributions.xml
+$(PDFDIR)/Samba3-ByExample.pdf $(PSDIR)/Samba3-ByExample.ps
$(DOCBOOKDIR)/Samba3-ByExample.xml Samba3-ByExample.tex: $(wildcard
Samba3-ByExample/*.xml)
+$(PDFDIR)/Samba3-HOWTO.pdf $(PSDIR)/Samba3-HOWTO.ps Samba3-HOWTO.tex
$(DOCBOOKDIR)/Samba3-HOWTO.xml: $(wildcard Samba3-HOWTO/*.xml)
Samba3-HOWTO-attributions.xml
Samba3-HOWTO/manpages.xml: $(MANPAGEDIR3)/smb.conf.5.xml
-$(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out
Samba3-Developers-Guide/index.xml,$(wildcard Samba3-Developers-Guide/*.xml))
Samba3-Developers-Guide-attributions.xml
-$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard
Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
+$(PDFDIR)/Samba3-Developers-Guide.pdf $(PSDIR)/Samba3-Developers-Guide.ps
$(DOCBOOKDIR)/Samba3-Developers-Guide.xml Samba3-Developers-Guide.tex:
$(wildcard Samba3-Developers-Guide/*.xml)
Samba3-Developers-Guide-attributions.xml
+$(PDFDIR)/Samba4-HOWTO.pdf $(PSDIR)/Samba4-HOWTO.ps Samba4-HOWTO.tex
$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard
Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
# Pseudo targets
all:: $(TARGETS)
@@ -53,23 +53,17 @@ release:: manpages3 htmlman3 html pdf
clean::
@echo "Cleaning up..."
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
- rm -f $(patsubst %.svg,%.png,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
- $(patsubst %.svg,%.pdf,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.eps,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.png,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
- rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx
*.aux
- rm -f *-images-html*
- rm -f *-images-latex-* $(LATEX_FIGURES)
- rm -f xslt/figures/*pdf
+ rm -f $(patsubst %.svg,%.png,$(wildcard */images/*.svg)) \
+ $(patsubst %.svg,%.eps,$(wildcard */images/*.svg)) \
+ $(patsubst %.png,%.eps,$(wildcard */images/*.png))
+ rm -f *-attributions.xml
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
- rm -f $(addsuffix .*,$(MAIN_DOCS))
rm -f build/catalog.xml
# Output format targets
pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
tex:: $(addsuffix .tex,$(MAIN_DOCS))
texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
@@ -110,7 +104,7 @@ $(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $< $@
-$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css
xslt/html-chunk.xsl %-images-html-chunks
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css
xslt/html-chunk.xsl
@mkdir -p $(@D)
$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl
$<
@@ -119,7 +113,16 @@ $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
@mkdir -p $(@D)
cp $< $@
-$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html:
%-images-html-single
+$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-png
+
+define IMAGES_TEMPLATE
+$(1)-images-png:: $$(patsubst %.svg,%.png,$$(wildcard $(1)/images/*.svg)) ;
+$(1)-images-eps:: $$(patsubst %.svg,%.eps,$$(wildcard $(1)/images/*.svg)) ;
+$(1)-images-eps:: $$(patsubst %.png,%.eps,$$(wildcard $(1)/images/*.png)) ;
+
+endef
+
+$(eval $(foreach DOC, $(MAIN_DOCS),$(call IMAGES_TEMPLATE,$(DOC))))
$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
$(XSLTPROC) --output $@ xslt/html.xsl $<
@@ -141,47 +144,12 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@mkdir -p $(@D)
@$(DBLATEX) $(DBLATEX_OPTIONS) -t tex -o $@ $<
-# Dependency files
-%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
- @echo "Generating dependency file for $*"
- @$(XSLTPROC) --novalid \
- --stringparam txtbasedir "$(TXTDIR)/$*/" \
- --stringparam target "$*" \
- -o $@ xslt/generate-dependencies.xsl $<
- @echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg,
\$$($*-images-latex)))" >> $@
- @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))"
>> $@
- @echo "$*-images-latex-pdf: \$$(patsubst %.svg, %.pdf,
\$$($*-images-latex-svg))" >> $@
- @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst
%.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png,
\$$($*-images-latex)))" >> $@
-
- @echo >> $@
- @echo "\$$(HTMLDIR)/%: $*/%" >> $@
- @echo " @mkdir -p \$$(@D)" >> $@
- @echo " @cp \$$< \$$@" >> $@
- @echo >> $@
- @echo "\$$(HTMLDIR)/$*/%: $*/%" >> $@
- @echo " @mkdir -p \$$(@D)" >> $@
- @echo " @cp \$$< \$$@" >> $@
- @echo >> $@
- @echo "\$$(HTMLHELPDIR)/$*/%: $*/%" >> $@
- @echo " @mkdir -p \$$(@D)" >> $@
- @echo " @cp \$$< \$$@" >> $@
- @echo >> $@
- @echo "$*-images-html-single: \$$(addprefix \$$(HTMLDIR)/,
\$$($*-images-html))" >> $@
- @echo "$*-images-html-chunks: \$$(addprefix \$$(HTMLDIR)/$*/,
\$$($*-images-html))" >> $@
- @echo "$*-images-htmlhelp: \$$(addprefix \$$(HTMLHELPDIR)/$*/,
\$$($*-images-html))" >> $@
-
-ifdef OUTPUTDIR
-ifneq ($(MAKECMDGOALS),clobber)
--include $(addsuffix .d,$(MAIN_DOCS))
-endif
-endif
-
# Adobe PDF files
-$(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-latex-png
%-images-latex-pdf
+$(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-png
$(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t pdf -o $@ $<
# PostScript files
-$(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
+$(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-eps
$(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $<
%.eps: %.svg
@@ -190,13 +158,10 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl
%-images-latex-eps
%.png: %.svg
$(INKSCAPE) -z -f $< --export-png=$@
-%.pdf: %.eps
- $(EPSTOPDF) $<
-
%.eps: %.png
$(PNGTOPNM) $< | $(PNMTOPS) > $@
-$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-png
$(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
--stringparam manifest.in.base.dir "$@/" \
--stringparam base.dir "$@/" \
@@ -275,11 +240,6 @@ archive: pdf
# XSL scripts
xslt/html.xsl: xslt/html-common.xsl
xslt/html-chunk.xsl: xslt/html-common.xsl
-xslt/latex.xsl:
-xslt/expand-sambadoc.xsl:
-xslt/generate-attributions.xsl:
-xslt/man.xsl:
-xslt/pearson.xsl:
distclean clobber:: clean
rm -f Makefile.settings config.status config.log
@@ -287,6 +247,7 @@ distclean clobber:: clean
realdistclean:: distclean
rm -f configure
rm -rf autom4te.cache
+ rm -rf output
# Always keep intermediate files if we can
.SECONDARY:
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 6353001..86c7373 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -17,7 +17,6 @@ OUTPUTDIR = output
ARCHIVEDIR = archive
TEXINFODIR = $(OUTPUTDIR)/texi
SRCDIR = ../source3
-EPSTOPDF = @EPSTOPDF@
MANPAGEDIR3 = manpages-3
SMBDOTCONFDOC = smbdotconf
DOCBOOKDIR = tmp
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 221081d..16a9aaa 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -19,7 +19,6 @@ DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP)
DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON)
DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER)
-DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)
DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)
DOCS_TARGET_REQUIRE_PROGRAM(DBLATEX, dblatex, LATEX)
diff --git a/docs-xml/xslt/generate-dependencies.xsl
b/docs-xml/xslt/generate-dependencies.xsl
deleted file mode 100644
index cf4e420..0000000
--- a/docs-xml/xslt/generate-dependencies.xsl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0'?>
-<!--
- Find the image dependencies of a certain XML file
- Generates (part of) a Makefile
-
- - $(FNAME)-images-latex-{png,eps,pdf} for role=latex
- - $(FNAME)-images-role for all other roles
- - $(TXTDIR)/$(FNAME)-text
-
- (C) Jelmer Vernooij 2004-2005
-
- Published under the GNU GPLv3 or later
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.1">
- <xsl:output method="text"/>
-
- <xsl:template match="/">
- <xsl:for-each select="//mediaobject/imageobje...@role and
not(@role=following::imageobject/@role)]">
- <xsl:call-template name="generate-images">
- <xsl:with-param name="role"><xsl:value-of
select="@role"/></xsl:with-param>
- </xsl:call-template>
- </xsl:for-each>
- <xsl:call-template name="generate-images">
- <xsl:with-param name="role"/>
- </xsl:call-template>
- <xsl:call-template name="generate-txt-chunks"/>
- </xsl:template>
-
- <xsl:template name="generate-images">
- <xsl:param name="role"/>
- <xsl:value-of
select="$target"/><xsl:text>-images-</xsl:text><xsl:value-of
select="$role"/><xsl:text> = </xsl:text>
- <xsl:for-each select="//mediaobject/imageobje...@role=$role]">
- <xsl:value-of select="imagedata/@fileref"/>
- <xsl:text> </xsl:text>
- </xsl:for-each>
- <xsl:text> </xsl:text>
- </xsl:template>
-
- <xsl:template name="generate-txt-chunks">
- <xsl:value-of select="$target"/><xsl:text>-txt-chunks:
</xsl:text>
- <xsl:for-each
select="(//chapter|//preface|//appendix)[...@id]|book">
- <xsl:value-of select="$txtbasedir"/>
- <xsl:choose>
- <xsl:when test="name() = 'book'">
- <xsl:text>index</xsl:text>
- </xsl:when>
- <xsl:when test="@id != ''">
- <xsl:value-of select="@id"/>
- </xsl:when>
- </xsl:choose>
- <xsl:text>.txt </xsl:text>
- </xsl:for-each>
- <xsl:text> </xsl:text>
- </xsl:template>
-</xsl:stylesheet>
--
Samba Shared Repository
