[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3386-gf3d355f
Michael Adam
obnox at samba.org
Wed Jan 21 11:16:40 GMT 2009
The branch, v3-2-test has been updated
via f3d355ffa75cd2b0f8cc51189e80aaf3552766d0 (commit)
via 410acb0410ce3c33da15dbefd0b59e971494d2fb (commit)
via d2e79f3e54cf1762df2ef814af90dcb16cb8e859 (commit)
via fe3680cb7ab54142d589c89789af73a3e32a6b79 (commit)
via d5f74cfc4434d754afc9fdd746c2a575ebdd3641 (commit)
via 299f1ae3f335ce99cb9b5d477e0950a4108f80cb (commit)
from 2545fcc48888628eef2d6b83ef5656be1e53bf7e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit f3d355ffa75cd2b0f8cc51189e80aaf3552766d0
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 11:47:46 2009 +0100
s3:docs: fix ommission in fix of (real)distclean targets
Michael
(cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 410acb0410ce3c33da15dbefd0b59e971494d2fb
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 11:41:14 2009 +0100
s3:docs: fix distclean target and add realdistclean target
- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean
Michael
(cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)
Signed-off-by: Michael Adam <obnox at samba.org>
commit d2e79f3e54cf1762df2ef814af90dcb16cb8e859
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue May 27 18:40:14 2008 +0200
Depend on latexfigures files directly as using a rule in between causes problems.
(This used to be commit bf3c2773f94c1db29a8a3e5935ff587f16f9a905)
(cherry picked from commit 5f6d0078d41e790ab4fa7dac15294821cdb4d4f0)
Signed-off-by: Michael Adam <obnox at samba.org>
commit fe3680cb7ab54142d589c89789af73a3e32a6b79
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed May 21 17:55:20 2008 +0200
Use double colon targets.
(This used to be commit 825cf91fa8b30a67d04cbda8885ff62a4c26458f)
(cherry picked from commit 323be4a6907e4915bb76aa103bf5b868f0b459b1)
Signed-off-by: Michael Adam <obnox at samba.org>
commit d5f74cfc4434d754afc9fdd746c2a575ebdd3641
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 16 15:46:36 2008 +0200
Add test target in Makefile.
(This used to be commit ac0d768676b1b8105a9141169b1afa248df6ce66)
(cherry picked from commit 0f3ba4b766ed83d2a38e6cae8db8690374d88989)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 299f1ae3f335ce99cb9b5d477e0950a4108f80cb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 16 15:31:54 2008 +0200
Make the make output a bit less chatty.
(This used to be commit 1fa4ef553c437bae07389c0f6a5410ba22ee4905)
(cherry picked from commit 70f52c06ba1d0d9638f1dfb8c42cd0d70364e9df)
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 78 ++++++++++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0f401d6..08e3f5e 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -50,10 +50,10 @@ $(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out Samba3-Developers-Guide/
$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
# Pseudo targets
-all: $(TARGETS)
-everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
-release: manpages3 htmlman3 html pdf
-clean:
+all:: $(TARGETS)
+everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
+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))) \
@@ -61,38 +61,43 @@ clean:
$(patsubst %.svg,%.eps,$(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-* latexfigures
+ rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
# Output format targets
-pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
-dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
-ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
-txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS))
-fo: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
-fo-pdf: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
-tex: $(addsuffix .tex,$(MAIN_DOCS))
-texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
-texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
-manpages3: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
-pearson: $(PEARSONDIR)/Samba3-HOWTO.xml
-pearson-verify: $(PEARSONDIR)/Samba3-HOWTO.report.html
-plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
-htmlman3: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
-html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
-html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
-htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
-validate: $(addsuffix -validate,$(MAIN_DOCS))
+pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
+dvi:: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
+ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
+txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
+txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
+fo:: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
+fo-pdf:: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
+tex:: $(addsuffix .tex,$(MAIN_DOCS))
+texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
+texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
+manpages3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
+pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
+pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
+plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
+htmlman3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
+html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
+html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
+htmlhelp:: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
+validate:: $(addsuffix -validate,$(MAIN_DOCS))
+
+test:: validate
+check:: validate
+
+.PHONY: test check validate
# Intermediate docbook docs
#
$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
@echo "Converting Samba-specific tags for $*..."
@mkdir -p $(@D)
- $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+ @$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
$(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
@mkdir -p $(@D)
@@ -105,7 +110,6 @@ $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl
@echo "</variablelist></article>" >> $@
# HTML docs
-
$(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $< $@
@@ -128,7 +132,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
%-attributions.xml:
@echo "Generating attributions file $@ from $*/"
@cp -f templates/attributions.xml $@
- $(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
+ @$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
# Text files
$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@@ -139,15 +143,13 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
%.tex: %/index.xml xslt/latex.xsl
@echo "Generating $@..."
@mkdir -p $(@D)
- $(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
-
-latexfigures: $(LATEX_FIGURES)
+ @$(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
$(PDFDIR)/%.pdf: %.pdf
@mkdir -p $(@D)
cp $< $@
-%.idx: %.tex latexfigures
+%.idx: %.tex $(LATEX_FIGURES)
-$(PDFLATEX) $<
%.ind: %.idx
@@ -156,8 +158,7 @@ $(PDFDIR)/%.pdf: %.pdf
# Dependency files
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
@echo "Generating dependency file for $*"
- $(XSLTPROC) \
- --novalid \
+ @$(XSLTPROC) --novalid \
--stringparam txtbasedir "$(TXTDIR)/$*/" \
--stringparam target "$*" \
-o $@ xslt/generate-dependencies.xsl $<
@@ -190,7 +191,7 @@ endif
endif
# Adobe PDF files
-%.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf
+%.pdf: %.tex %.ind $(LATEX_FIGURES) %-images-latex-png %-images-latex-pdf
-$(PDFLATEX) $<
-$(PDFLATEX) $<
-$(PDFLATEX) $<
@@ -318,12 +319,15 @@ xslt/generate-attributions.xsl:
xslt/man.xsl:
xslt/pearson.xsl:
-distclean clobber: clean
- rm Makefile.settings config.status config.log configure
+distclean clobber:: clean
+ rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+ rm -f configure
rm -rf autom4te.cache
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber archive release everything all $(TARGETS) latexfigures
+.PHONY: clean clobber archive release everything all
--
Samba Shared Repository
More information about the samba-cvs
mailing list