Next update of VFS modules development guide

[import/samba-docs-svnimport.git] / Makefile

diff --git a/Makefile b/Makefile
index 68fdaadfd1fdbf6c8eae94d3de0ff51e7a398979..1e4121053d871132a19f777eaeb25197068d23a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,9 @@ release: manpages3 htmlman3 html pdf
 clean:
        @echo "Cleaning up..." 
        rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
-       rm -f $(patsubst %.dia,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
-                       $(patsubst %.dia,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
-                       $(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia)))
+       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)))
        rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
        rm -f *-images-html*
        rm -f *-images-latex-* latexfigures
@@ -161,10 +161,10 @@ $(PDFDIR)/%.pdf: %.pdf
                --stringparam txtbasedir "$(TXTDIR)/$*/" \
                --stringparam target "$*" \
                -o $@ xslt/generate-dependencies.xsl $<
-       @echo "$*-images-latex-dia = \$$(wildcard \$$(addsuffix .dia, \$$($*-images-latex)))" >> $@
+       @echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, \$$($*-images-latex)))" >> $@
        @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
-       @echo "$*-images-latex-pdf: \$$(patsubst %.dia, %.pdf, \$$($*-images-latex-dia))" >> $@
-       @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.dia,%.png,\$$($*-images-latex-dia)), \$$(addsuffix .png, \$$($*-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)/%: $*/%" >> $@
@@ -191,6 +191,9 @@ endif
 
 # Adobe PDF files
 %.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf
+       -$(PDFLATEX) $<
+       -$(PDFLATEX) $<
+       -$(PDFLATEX) $<
        -$(PDFLATEX) $<
        $(THUMBPDF) --quiet $*.pdf
        -$(PDFLATEX) $<
@@ -203,11 +206,14 @@ $(DVIDIR)/%.dvi: %.dvi
 %.dvi: %.tex %.idx %-images-latex-eps
        -$(LATEX) $< 
 
-%.eps: %.dia
-       $(DIA) -t eps-builtin -e $@ $<
+%.eps: %.svg
+       $(INKSCAPE) -z -f $< --export-eps=$@
+
+%.png: %.svg
+       $(INKSCAPE) -z -f $< --export-png=$@
 
-%.png: %.dia
-       $(DIA) -e $@ $<
+#%.pdf: %.svg
+#      $(INKSCAPE) -z -f $< --export-pdf=$@
 
 %.pdf: %.eps
        $(EPSTOPDF) $<
@@ -314,6 +320,7 @@ xslt/pearson.xsl:
 
 distclean clobber: clean
        rm Makefile.settings config.status config.log configure
+       rm -rf autom4te.cache
 
 
 # Always keep intermediate files if we can