From c52786ee1c37139b9d2f7041fcc858cdd0c6e8f3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 May 2008 18:40:14 +0200 Subject: [PATCH] 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 --- docs-xml/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 70ffdc13bb5..2acef3e2432 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 -- 2.34.1