diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-06-13 20:25:32 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:46:47 -0500 |
| commit | 300b9cd394039a0937b63cd963d1b2f643ea1c49 (patch) | |
| tree | d87715e11b1ca7df9e42e2d3ada56d1fcc25ab31 /docs/Makefile | |
| parent | 2a6e3785dc1dade7e016768e3672532b7af647d9 (diff) | |
| download | samba-300b9cd394039a0937b63cd963d1b2f643ea1c49.tar.gz samba-300b9cd394039a0937b63cd963d1b2f643ea1c49.tar.bz2 samba-300b9cd394039a0937b63cd963d1b2f643ea1c49.zip | |
Fix image quality
(This used to be commit 75faf6c3aeff6716f7a5a10066d7cb960253a58e)
Diffstat (limited to 'docs/Makefile')
| -rw-r--r-- | docs/Makefile | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/docs/Makefile b/docs/Makefile index de00a6ace5..a2b330967c 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -75,7 +75,7 @@ validate: $(addsuffix -validate,$(MAIN_DOCS)) # $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) - $(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< + $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< $(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) @@ -140,9 +140,11 @@ $(PDFDIR)/%.pdf: %.pdf --stringparam txtbasedir "$(TXTDIR)/$*/" \ --stringparam target "$*" \ -o $@ xslt/generate-dependencies.xsl $< - @echo "$*-images-latex-png: \$$(addsuffix .png, \$$($*-images-latex))" >> $@ - @echo >> $@ + @echo "$*-images-latex-dia = \$$(wildcard \$$(addsuffix .dia, \$$($*-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 >> $@ @echo "\$$(HTMLDIR)/%: $*/%" >> $@ @echo " mkdir -p \$$(@D)" >> $@ @@ -167,7 +169,7 @@ endif endif # Adobe PDF files -%.pdf: %.tex %.ind latexfigures %-images-latex-png +%.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf -$(PDFLATEX) $< $(THUMBPDF) --quiet $*.pdf -$(PDFLATEX) $< @@ -180,8 +182,11 @@ $(DVIDIR)/%.dvi: %.dvi %.dvi: %.tex %.idx %-images-latex-eps -$(LATEX) $< -%.png: %.dia - $(DIA) -e $@ $< +%.eps: %.dia + $(DIA) -t eps-builtin -e $@ $< + +%.pdf: %.eps + $(EPSTOPDF) $< %.eps: %.png $(PNGTOPNM) $< | $(PNMTOPS) > $@ @@ -191,9 +196,6 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi mkdir -p $(@D) $(DVIPS) -o $@ $< -xslt/figures/%.pdf: xslt/figures/%.eps - $(EPSTOPDF) $< - # Fo $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml mkdir -p $(@D) @@ -289,6 +291,9 @@ clobber: clean clean: 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 *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux rm -f *-images-html* rm -f *-images-latex-* latexfigures |