diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-09-05 12:36:21 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:46:01 -0500 |
| commit | 5f302fc9cd5c871e26def230a8456f17c104baf9 (patch) | |
| tree | cdfb2f3db69c3251977c96bd1eecba7f29a8c627 | |
| parent | 2837fef478112b527fc85776e67baca55e7bce0f (diff) | |
| download | samba-5f302fc9cd5c871e26def230a8456f17c104baf9.tar.gz samba-5f302fc9cd5c871e26def230a8456f17c104baf9.tar.bz2 samba-5f302fc9cd5c871e26def230a8456f17c104baf9.zip | |
Use dia to generate png images out of dia files
(This used to be commit a46ab88b4481d63173f67ad85eb93ce281277562)
38 files changed, 7 insertions, 3 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in index 71b88e01e2..ad46ad2f57 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -12,6 +12,7 @@ DVIPS = @DVIPS@ PNGTOPNM = @PNGTOPNM@ EPSTOPNM = @EPSTOPNM@ PNMTOPNG = @PNMTOPNG@ +DIA = @DIA@ PNMTOPS = @PNMTOPS@ HTML2TEXT = @HTML2TEXT@ PLUCKERBUILD = @PLUCKERBUILD@ @@ -166,6 +167,7 @@ $(PDFDIR)/%.pdf: %.pdf # 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,9 +180,9 @@ $(DVIDIR)/%.dvi: %.dvi %.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) > $@ diff --git a/docs/Samba-Guide/images/AccountingNetwork.png b/docs/Samba-Guide/images/AccountingNetwork.png Binary files differdeleted file mode 100644 index 8b1222721d..0000000000 --- a/docs/Samba-Guide/images/AccountingNetwork.png +++ /dev/null diff --git a/docs/Samba-Guide/images/Charity-Network.png b/docs/Samba-Guide/images/Charity-Network.png Binary files differdeleted file mode 100644 index eeb06cc729..0000000000 --- a/docs/Samba-Guide/images/Charity-Network.png +++ /dev/null diff --git a/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png Binary files differdeleted file mode 100644 index 3dfe36a2af..0000000000 --- a/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png +++ /dev/null diff --git a/docs/Samba-Guide/images/acct2net.png b/docs/Samba-Guide/images/acct2net.png Binary files differdeleted file mode 100644 index 7290dfa827..0000000000 --- a/docs/Samba-Guide/images/acct2net.png +++ /dev/null diff --git a/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png Binary files differdeleted file mode 100644 index b8272d2b58..0000000000 --- a/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png +++ /dev/null diff --git a/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png Binary files differdeleted file mode 100644 index 13a05edc94..0000000000 --- a/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png +++ /dev/null diff --git a/docs/Samba-Guide/images/ch7-fail-overLDAP.png b/docs/Samba-Guide/images/ch7-fail-overLDAP.png Binary files differdeleted file mode 100644 index 2f24929c84..0000000000 --- a/docs/Samba-Guide/images/ch7-fail-overLDAP.png +++ /dev/null diff --git a/docs/Samba-Guide/images/ch7-singleLDAP.png b/docs/Samba-Guide/images/ch7-singleLDAP.png Binary files differdeleted file mode 100644 index 74ab7a49d9..0000000000 --- a/docs/Samba-Guide/images/ch7-singleLDAP.png +++ /dev/null diff --git a/docs/Samba-Guide/images/ch8-migration.png b/docs/Samba-Guide/images/ch8-migration.png Binary files differdeleted file mode 100644 index 8ac2f506dd..0000000000 --- a/docs/Samba-Guide/images/ch8-migration.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap4-net.png b/docs/Samba-Guide/images/chap4-net.png Binary files differdeleted file mode 100644 index f59c25bddb..0000000000 --- a/docs/Samba-Guide/images/chap4-net.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap5-net.png b/docs/Samba-Guide/images/chap5-net.png Binary files differdeleted file mode 100644 index 3af0c9a639..0000000000 --- a/docs/Samba-Guide/images/chap5-net.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap6-net.png b/docs/Samba-Guide/images/chap6-net.png Binary files differdeleted file mode 100644 index 5e549e3273..0000000000 --- a/docs/Samba-Guide/images/chap6-net.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap7-idresol.png b/docs/Samba-Guide/images/chap7-idresol.png Binary files differdeleted file mode 100644 index 7071d9a09d..0000000000 --- a/docs/Samba-Guide/images/chap7-idresol.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap7-net-A.png b/docs/Samba-Guide/images/chap7-net-A.png Binary files differdeleted file mode 100644 index 820217bbfd..0000000000 --- a/docs/Samba-Guide/images/chap7-net-A.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap7-net.png b/docs/Samba-Guide/images/chap7-net.png Binary files differdeleted file mode 100644 index ede12fbef4..0000000000 --- a/docs/Samba-Guide/images/chap7-net.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap7-net2-B.png b/docs/Samba-Guide/images/chap7-net2-B.png Binary files differdeleted file mode 100644 index 0fd9cd4063..0000000000 --- a/docs/Samba-Guide/images/chap7-net2-B.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap7-net2.png b/docs/Samba-Guide/images/chap7-net2.png Binary files differdeleted file mode 100644 index 7bb570c1b0..0000000000 --- a/docs/Samba-Guide/images/chap7-net2.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap9-ADSDC.png b/docs/Samba-Guide/images/chap9-ADSDC.png Binary files differdeleted file mode 100644 index dc91c3e4c4..0000000000 --- a/docs/Samba-Guide/images/chap9-ADSDC.png +++ /dev/null diff --git a/docs/Samba-Guide/images/chap9-SambaDC.png b/docs/Samba-Guide/images/chap9-SambaDC.png Binary files differdeleted file mode 100644 index f2cccdaeca..0000000000 --- a/docs/Samba-Guide/images/chap9-SambaDC.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/access1.png b/docs/Samba-HOWTO-Collection/images/access1.png Binary files differdeleted file mode 100644 index 0d070a6109..0000000000 --- a/docs/Samba-HOWTO-Collection/images/access1.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/browsing1 b/docs/Samba-HOWTO-Collection/images/browsing1.dia Binary files differindex 8235df45f6..8235df45f6 100644 --- a/docs/Samba-HOWTO-Collection/images/browsing1 +++ b/docs/Samba-HOWTO-Collection/images/browsing1.dia diff --git a/docs/Samba-HOWTO-Collection/images/browsing1.png b/docs/Samba-HOWTO-Collection/images/browsing1.png Binary files differdeleted file mode 100644 index bfe76dcb63..0000000000 --- a/docs/Samba-HOWTO-Collection/images/browsing1.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/cups1.png b/docs/Samba-HOWTO-Collection/images/cups1.png Binary files differdeleted file mode 100644 index cbe646a5fa..0000000000 --- a/docs/Samba-HOWTO-Collection/images/cups1.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/cups2.png b/docs/Samba-HOWTO-Collection/images/cups2.png Binary files differdeleted file mode 100644 index d0713c07ca..0000000000 --- a/docs/Samba-HOWTO-Collection/images/cups2.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/domain.png b/docs/Samba-HOWTO-Collection/images/domain.png Binary files differdeleted file mode 100644 index 82d299b086..0000000000 --- a/docs/Samba-HOWTO-Collection/images/domain.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png Binary files differdeleted file mode 100644 index b8cf5d2257..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap-groups.png b/docs/Samba-HOWTO-Collection/images/idmap-groups.png Binary files differdeleted file mode 100644 index e5c214574f..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap-groups.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png Binary files differdeleted file mode 100644 index daadfc1f90..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png Binary files differdeleted file mode 100644 index 3acc07bd11..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png Binary files differdeleted file mode 100644 index 911c996329..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png Binary files differdeleted file mode 100644 index f30c632500..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/idmap.png b/docs/Samba-HOWTO-Collection/images/idmap.png Binary files differdeleted file mode 100644 index b090ced632..0000000000 --- a/docs/Samba-HOWTO-Collection/images/idmap.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png Binary files differdeleted file mode 100644 index b80efe9f16..0000000000 --- a/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/pdftosocket.png b/docs/Samba-HOWTO-Collection/images/pdftosocket.png Binary files differdeleted file mode 100644 index ea4a9dae93..0000000000 --- a/docs/Samba-HOWTO-Collection/images/pdftosocket.png +++ /dev/null diff --git a/docs/Samba-HOWTO-Collection/images/trusts1.png b/docs/Samba-HOWTO-Collection/images/trusts1.png Binary files differdeleted file mode 100644 index 72aa60d4cc..0000000000 --- a/docs/Samba-HOWTO-Collection/images/trusts1.png +++ /dev/null diff --git a/docs/configure.in b/docs/configure.in index ea75ef669b..1471e43070 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -40,6 +40,7 @@ AC_SUBST(SAMBASOURCEDIR) 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) diff --git a/docs/scripts/copy-images.sh b/docs/scripts/copy-images.sh index 9f654a34ae..cba43d9d99 100755 --- a/docs/scripts/copy-images.sh +++ b/docs/scripts/copy-images.sh @@ -6,6 +6,7 @@ TO="$4" 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 |
