Author: jelmer Date: 2004-09-05 12:36:21 +0000 (Sun, 05 Sep 2004) New Revision: 213
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=213&nolog=1 Log: Use dia to generate png images out of dia files Added: trunk/Samba-HOWTO-Collection/images/browsing1.dia Removed: trunk/Samba-Guide/images/AccountingNetwork.png trunk/Samba-Guide/images/Charity-Network.png trunk/Samba-Guide/images/UNIX-Samba-and-LDAP.png trunk/Samba-Guide/images/acct2net.png trunk/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png trunk/Samba-Guide/images/ch7-dual-additive-LDAP.png trunk/Samba-Guide/images/ch7-fail-overLDAP.png trunk/Samba-Guide/images/ch7-singleLDAP.png trunk/Samba-Guide/images/ch8-migration.png trunk/Samba-Guide/images/chap4-net.png trunk/Samba-Guide/images/chap5-net.png trunk/Samba-Guide/images/chap6-net.png trunk/Samba-Guide/images/chap7-idresol.png trunk/Samba-Guide/images/chap7-net-A.png trunk/Samba-Guide/images/chap7-net.png trunk/Samba-Guide/images/chap7-net2-B.png trunk/Samba-Guide/images/chap7-net2.png trunk/Samba-Guide/images/chap9-ADSDC.png trunk/Samba-Guide/images/chap9-SambaDC.png trunk/Samba-HOWTO-Collection/images/access1.png trunk/Samba-HOWTO-Collection/images/browsing1 trunk/Samba-HOWTO-Collection/images/browsing1.png trunk/Samba-HOWTO-Collection/images/cups1.png trunk/Samba-HOWTO-Collection/images/cups2.png trunk/Samba-HOWTO-Collection/images/domain.png trunk/Samba-HOWTO-Collection/images/idmap-gid2sid.png trunk/Samba-HOWTO-Collection/images/idmap-groups.png trunk/Samba-HOWTO-Collection/images/idmap-sid2gid.png trunk/Samba-HOWTO-Collection/images/idmap-sid2uid.png trunk/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png trunk/Samba-HOWTO-Collection/images/idmap-uid2sid.png trunk/Samba-HOWTO-Collection/images/idmap.png trunk/Samba-HOWTO-Collection/images/pdftoepsonusb.png trunk/Samba-HOWTO-Collection/images/pdftosocket.png trunk/Samba-HOWTO-Collection/images/trusts1.png Modified: trunk/Makefile.in trunk/configure.in trunk/scripts/copy-images.sh Changeset: Modified: trunk/Makefile.in =================================================================== --- trunk/Makefile.in 2004-09-04 14:47:12 UTC (rev 212) +++ trunk/Makefile.in 2004-09-05 12:36:21 UTC (rev 213) @@ -12,6 +12,7 @@ PNGTOPNM = @PNGTOPNM@ EPSTOPNM = @EPSTOPNM@ PNMTOPNG = @PNMTOPNG@ +DIA = @DIA@ PNMTOPS = @PNMTOPS@ HTML2TEXT = @HTML2TEXT@ PLUCKERBUILD = @PLUCKERBUILD@ @@ -166,6 +167,7 @@ # Adobe PDF files %.pdf: %.tex %.ind latexfigures + $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".png" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml) -$(PDFLATEX) $< $(THUMBPDF) $*.pdf -$(PDFLATEX) $< @@ -178,10 +180,10 @@ %.dvi: %.tex %.idx $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml) -$(LATEX) $< - -$(LATEX) $< - $(MAKEINDEX) $*.idx - -$(LATEX) $< +%.png: %.dia + $(DIA) -e $@ $< + %.eps: %.png $(PNGTOPNM) $< | $(PNMTOPS) > $@ Deleted: trunk/Samba-Guide/images/AccountingNetwork.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/Charity-Network.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/UNIX-Samba-and-LDAP.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/acct2net.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/ch7-dual-additive-LDAP.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/ch7-fail-overLDAP.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/ch7-singleLDAP.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/ch8-migration.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap4-net.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap5-net.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap6-net.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap7-idresol.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap7-net-A.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap7-net.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap7-net2-B.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap7-net2.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap9-ADSDC.png =================================================================== (Binary files differ) Deleted: trunk/Samba-Guide/images/chap9-SambaDC.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/access1.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/browsing1 =================================================================== (Binary files differ) Copied: trunk/Samba-HOWTO-Collection/images/browsing1.dia (from rev 212, trunk/Samba-HOWTO-Collection/images/browsing1) Deleted: trunk/Samba-HOWTO-Collection/images/browsing1.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/cups1.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/cups2.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/domain.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap-gid2sid.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap-groups.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap-sid2gid.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap-sid2uid.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap-uid2sid.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/idmap.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/pdftoepsonusb.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/pdftosocket.png =================================================================== (Binary files differ) Deleted: trunk/Samba-HOWTO-Collection/images/trusts1.png =================================================================== (Binary files differ) Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2004-09-04 14:47:12 UTC (rev 212) +++ trunk/configure.in 2004-09-05 12:36:21 UTC (rev 213) @@ -40,6 +40,7 @@ DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, ALL) DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX) DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF) DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF) Modified: trunk/scripts/copy-images.sh =================================================================== --- trunk/scripts/copy-images.sh 2004-09-04 14:47:12 UTC (rev 212) +++ trunk/scripts/copy-images.sh 2004-09-05 12:36:21 UTC (rev 213) @@ -6,6 +6,7 @@ for x in `xsltproc --stringparam prepend "" --stringparam append "" --stringparam role "$ROLE" xslt/find-image-dependencies.xsl "$XMLFILE"` do + test -f $FROM/$x || make $FROM/$x || exit 1 cp -u $FROM/$x $TO/$x || exit 1 done exit