s3:docs: clean build/catalog.xml in "make clean"

[samba.git] / docs-xml / Makefile

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 630ceb32f92b4a0a3e7a6d2946387ba96d3952c6..610d720d94301c361c7e8baf4e8aaf139db81889 100644 (file)
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -58,13 +58,15 @@ clean::
        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,%.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-* latexfigures
+       rm -f *-images-latex-* $(LATEX_FIGURES)
        rm -f xslt/figures/*pdf
        rm -f $(SMBDOTCONFDOC)/parameters.*.xml
        rm -f $(addsuffix .*,$(MAIN_DOCS))
+       rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
@@ -145,13 +147,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 +193,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) $<
@@ -321,12 +321,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