summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Makefile.in8
-rw-r--r--docs/Samba-Guide/images/AccountingNetwork.pngbin12581 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/Charity-Network.pngbin14160 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/UNIX-Samba-and-LDAP.pngbin26820 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/acct2net.pngbin15985 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.pngbin8285 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/ch7-dual-additive-LDAP.pngbin11799 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/ch7-fail-overLDAP.pngbin6227 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/ch7-singleLDAP.pngbin3028 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/ch8-migration.pngbin16610 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap4-net.pngbin24030 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap5-net.pngbin39268 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap6-net.pngbin40201 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap7-idresol.pngbin21304 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap7-net-A.pngbin85518 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap7-net.pngbin75323 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap7-net2-B.pngbin88103 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap7-net2.pngbin86194 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap9-ADSDC.pngbin32779 -> 0 bytes
-rw-r--r--docs/Samba-Guide/images/chap9-SambaDC.pngbin30331 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/access1.pngbin9839 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/browsing1.dia (renamed from docs/Samba-HOWTO-Collection/images/browsing1)bin2974 -> 2974 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/browsing1.pngbin20288 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/cups1.pngbin38328 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/cups2.pngbin41184 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/domain.pngbin35745 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap-gid2sid.pngbin21240 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap-groups.pngbin9175 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap-sid2gid.pngbin21274 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap-sid2uid.pngbin26948 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.pngbin6795 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap-uid2sid.pngbin23928 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/idmap.pngbin8542 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/pdftoepsonusb.pngbin4265 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/pdftosocket.pngbin2138 -> 0 bytes
-rw-r--r--docs/Samba-HOWTO-Collection/images/trusts1.pngbin12716 -> 0 bytes
-rw-r--r--docs/configure.in1
-rwxr-xr-xdocs/scripts/copy-images.sh1
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
deleted file mode 100644
index 8b1222721d..0000000000
--- a/docs/Samba-Guide/images/AccountingNetwork.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/Charity-Network.png b/docs/Samba-Guide/images/Charity-Network.png
deleted file mode 100644
index eeb06cc729..0000000000
--- a/docs/Samba-Guide/images/Charity-Network.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png
deleted file mode 100644
index 3dfe36a2af..0000000000
--- a/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/acct2net.png b/docs/Samba-Guide/images/acct2net.png
deleted file mode 100644
index 7290dfa827..0000000000
--- a/docs/Samba-Guide/images/acct2net.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
deleted file mode 100644
index b8272d2b58..0000000000
--- a/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png
deleted file mode 100644
index 13a05edc94..0000000000
--- a/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/ch7-fail-overLDAP.png b/docs/Samba-Guide/images/ch7-fail-overLDAP.png
deleted file mode 100644
index 2f24929c84..0000000000
--- a/docs/Samba-Guide/images/ch7-fail-overLDAP.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/ch7-singleLDAP.png b/docs/Samba-Guide/images/ch7-singleLDAP.png
deleted file mode 100644
index 74ab7a49d9..0000000000
--- a/docs/Samba-Guide/images/ch7-singleLDAP.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/ch8-migration.png b/docs/Samba-Guide/images/ch8-migration.png
deleted file mode 100644
index 8ac2f506dd..0000000000
--- a/docs/Samba-Guide/images/ch8-migration.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap4-net.png b/docs/Samba-Guide/images/chap4-net.png
deleted file mode 100644
index f59c25bddb..0000000000
--- a/docs/Samba-Guide/images/chap4-net.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap5-net.png b/docs/Samba-Guide/images/chap5-net.png
deleted file mode 100644
index 3af0c9a639..0000000000
--- a/docs/Samba-Guide/images/chap5-net.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap6-net.png b/docs/Samba-Guide/images/chap6-net.png
deleted file mode 100644
index 5e549e3273..0000000000
--- a/docs/Samba-Guide/images/chap6-net.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap7-idresol.png b/docs/Samba-Guide/images/chap7-idresol.png
deleted file mode 100644
index 7071d9a09d..0000000000
--- a/docs/Samba-Guide/images/chap7-idresol.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap7-net-A.png b/docs/Samba-Guide/images/chap7-net-A.png
deleted file mode 100644
index 820217bbfd..0000000000
--- a/docs/Samba-Guide/images/chap7-net-A.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap7-net.png b/docs/Samba-Guide/images/chap7-net.png
deleted file mode 100644
index ede12fbef4..0000000000
--- a/docs/Samba-Guide/images/chap7-net.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap7-net2-B.png b/docs/Samba-Guide/images/chap7-net2-B.png
deleted file mode 100644
index 0fd9cd4063..0000000000
--- a/docs/Samba-Guide/images/chap7-net2-B.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap7-net2.png b/docs/Samba-Guide/images/chap7-net2.png
deleted file mode 100644
index 7bb570c1b0..0000000000
--- a/docs/Samba-Guide/images/chap7-net2.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap9-ADSDC.png b/docs/Samba-Guide/images/chap9-ADSDC.png
deleted file mode 100644
index dc91c3e4c4..0000000000
--- a/docs/Samba-Guide/images/chap9-ADSDC.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-Guide/images/chap9-SambaDC.png b/docs/Samba-Guide/images/chap9-SambaDC.png
deleted file mode 100644
index f2cccdaeca..0000000000
--- a/docs/Samba-Guide/images/chap9-SambaDC.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/access1.png b/docs/Samba-HOWTO-Collection/images/access1.png
deleted file mode 100644
index 0d070a6109..0000000000
--- a/docs/Samba-HOWTO-Collection/images/access1.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/browsing1 b/docs/Samba-HOWTO-Collection/images/browsing1.dia
index 8235df45f6..8235df45f6 100644
--- a/docs/Samba-HOWTO-Collection/images/browsing1
+++ b/docs/Samba-HOWTO-Collection/images/browsing1.dia
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/browsing1.png b/docs/Samba-HOWTO-Collection/images/browsing1.png
deleted file mode 100644
index bfe76dcb63..0000000000
--- a/docs/Samba-HOWTO-Collection/images/browsing1.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/cups1.png b/docs/Samba-HOWTO-Collection/images/cups1.png
deleted file mode 100644
index cbe646a5fa..0000000000
--- a/docs/Samba-HOWTO-Collection/images/cups1.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/cups2.png b/docs/Samba-HOWTO-Collection/images/cups2.png
deleted file mode 100644
index d0713c07ca..0000000000
--- a/docs/Samba-HOWTO-Collection/images/cups2.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/domain.png b/docs/Samba-HOWTO-Collection/images/domain.png
deleted file mode 100644
index 82d299b086..0000000000
--- a/docs/Samba-HOWTO-Collection/images/domain.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png
deleted file mode 100644
index b8cf5d2257..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-groups.png b/docs/Samba-HOWTO-Collection/images/idmap-groups.png
deleted file mode 100644
index e5c214574f..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap-groups.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png
deleted file mode 100644
index daadfc1f90..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png
deleted file mode 100644
index 3acc07bd11..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
deleted file mode 100644
index 911c996329..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png
deleted file mode 100644
index f30c632500..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/idmap.png b/docs/Samba-HOWTO-Collection/images/idmap.png
deleted file mode 100644
index b090ced632..0000000000
--- a/docs/Samba-HOWTO-Collection/images/idmap.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png
deleted file mode 100644
index b80efe9f16..0000000000
--- a/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/pdftosocket.png b/docs/Samba-HOWTO-Collection/images/pdftosocket.png
deleted file mode 100644
index ea4a9dae93..0000000000
--- a/docs/Samba-HOWTO-Collection/images/pdftosocket.png
+++ /dev/null
Binary files differ
diff --git a/docs/Samba-HOWTO-Collection/images/trusts1.png b/docs/Samba-HOWTO-Collection/images/trusts1.png
deleted file mode 100644
index 72aa60d4cc..0000000000
--- a/docs/Samba-HOWTO-Collection/images/trusts1.png
+++ /dev/null
Binary files differ
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