[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2621-gbf3c277

Jelmer Vernooij jelmer at samba.org
Tue May 27 16:41:06 GMT 2008


The branch, v3-3-test has been updated
       via  bf3c2773f94c1db29a8a3e5935ff587f16f9a905 (commit)
      from  4d89c39f267a5623f7050ff8db94bcdd191fca23 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit bf3c2773f94c1db29a8a3e5935ff587f16f9a905
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.

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Makefile |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 70ffdc1..2acef3e 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -61,7 +61,7 @@ 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))
@@ -145,13 +145,11 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
 	@mkdir -p $(@D)
 	@$(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
 
-latexfigures:: $(LATEX_FIGURES)
-
 $(PDFDIR)/%.pdf: %.pdf
 	@mkdir -p $(@D)
 	cp $< $@
 
-%.idx: %.tex latexfigures
+%.idx: %.tex $(LATEX_FIGURES)
 	-$(PDFLATEX) $<
 
 %.ind: %.idx
@@ -193,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) $<
@@ -328,5 +326,5 @@ distclean clobber:: clean
 
 # Always keep intermediate files if we can
 .SECONDARY:
-.PHONY: clean clobber archive release everything all latexfigures
+.PHONY: clean clobber archive release everything all 
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list