aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@infotropique.org>2017-09-26 16:17:08 +0000
committerng0 <ng0@infotropique.org>2017-09-26 16:17:08 +0000
commit3c3090717610ea787fdd3562901329254a6af0d6 (patch)
tree2a6d129263ef349bc69f4bf62377dacf432ed5da
parentfebd18e42cb9ce7b05a48db0550474681fb7133c (diff)
downloadgnunet-3c3090717610ea787fdd3562901329254a6af0d6.tar.gz
gnunet-3c3090717610ea787fdd3562901329254a6af0d6.zip
..
-rw-r--r--contrib/packages/guix/guix-env.scm2
-rw-r--r--doc/Makefile.am146
2 files changed, 93 insertions, 55 deletions
diff --git a/contrib/packages/guix/guix-env.scm b/contrib/packages/guix/guix-env.scm
index 1182eb08d..c62a713a2 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -146,7 +146,7 @@
146 ("autoconf" ,autoconf) 146 ("autoconf" ,autoconf)
147 ("automake" ,automake) 147 ("automake" ,automake)
148 ("gnu-gettext" ,gnu-gettext) 148 ("gnu-gettext" ,gnu-gettext)
149 ("texinfo" ,texinfo-5.2) ; Debian stable. 149 ("texinfo" ,texinfo-5) ; Debian stable: 5.2
150 ("libtool" ,libtool))) 150 ("libtool" ,libtool)))
151 ;; TODO: To make use of out:debug, which carries the symbols, 151 ;; TODO: To make use of out:debug, which carries the symbols,
152 ;; this file needs to fixed. 152 ;; this file needs to fixed.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7951bb26b..0fadf1a37 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,42 +5,76 @@ docdir = $(datadir)/doc/gnunet/
5 5
6infoimagedir = $(infodir)/images 6infoimagedir = $(infodir)/images
7 7
8DOT_FILES = images/$(wildcard *.dot) 8#DOT_FILES = images/$(wildcard *.dot)
9 9
10DOT_VECTOR_GRAPHICS = \ 10#DOT_VECTOR_GRAPHICS = \
11 $(DOT_FILES:%.dot=%.eps) \ 11# $(DOT_FILES:%.dot=%.eps) \
12 $(DOT_FILES:%.dot=%.pdf) 12# $(DOT_FILES:%.dot=%.pdf)
13 13
14dist_infoimage_DATA = \ 14dist_infoimage_DATA = \
15 images/$(wildcard *.png) \ 15 images/gnunet-gtk-0-10-gns-a-done.png \
16 images/$(wildcard *.svg) \ 16 images/gnunet-gtk-0-10-gns-a.png \
17 $(DOT_FILES:%.dot=%.png) 17 images/daemon_lego_block.png \
18 18 images/gnunet-gtk-0-10-gns.png \
19DOT_OPTIONS = \ 19 images/gnunet-0-10-peerinfo.png \
20 -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \ 20 images/gnunet-gtk-0-10-identity.png \
21 -Nfontsite=9 -Nheight=.1 -Nwidth=.1 21 images/gnunet-fs-gtk-0-10-star-tab.png \
22 22 images/gnunet-gtk-0-10.png \
23.dot.png: 23 images/gnunet-gtk-0-10-download-area.png \
24 $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ 24 images/gnunet-gtk-0-10-search-selected.png \
25 mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" 25 images/gnunet-gtk-0-10-fs-menu.png \
26 26 images/gnunet-gtk-0-10-traffic.png \
27.dot.pdf: 27 images/gnunet-gtk-0-10-fs.png \
28 $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ 28 images/gnunet-namestore-gtk-phone.png \
29 mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" 29 images/gnunet-gtk-0-10-fs-publish-editing.png \
30 30 images/gnunet-namestore-gtk-vpn.png \
31.dot.eps: 31 images/gnunet-gtk-0-10-fs-published.png \
32 $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ 32 images/gnunet-setup-exit.png \
33 mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" 33 images/gnunet-gtk-0-10-fs-publish.png \
34 34 images/iceweasel-preferences.png \
35.png.eps: 35 images/gnunet-gtk-0-10-fs-publish-select.png \
36 $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \ 36 images/iceweasel-proxy.png \
37 mv "$@-tmp.eps" "$@" 37 images/gnunet-gtk-0-10-fs-publish-with-file_0.png \
38 38 images/service_lego_block.png \
39pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf) 39 images/gnunet-gtk-0-10-fs-publish-with-file.png \
40info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png) 40 images/service_stack.png \
41ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \ 41 images/gnunet-gtk-0-10-fs-search.png \
42 $(top_srcdir)/%D%/images/coreutils-size-map.eps 42 images/gnunet-tutorial-service.png \
43dvi-local: ps-local 43 images/gnunet-tutorial-system.png \
44 images/daemon_lego_block.svg \
45 images/lego_stack.svg \
46 images/service_lego_block.svg \
47 images/structure.dot
48
49# images/$(wildcard *.png) \
50# images/$(wildcard *.svg)
51# $(DOT_FILES:%.dot=%.png)
52
53#DOT_OPTIONS = \
54# -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \
55# -Nfontsite=9 -Nheight=.1 -Nwidth=.1
56
57# .dot.png:
58# $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
59# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
60
61# .dot.pdf:
62# $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
63# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
64
65# .dot.eps:
66# $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
67# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
68
69# .png.eps:
70# $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
71# mv "$@-tmp.eps" "$@"
72
73# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
74# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
75# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
76# $(top_srcdir)/%D%/images/coreutils-size-map.eps
77# dvi-local: ps-local
44 78
45gnunet_tutorial_examples = \ 79gnunet_tutorial_examples = \
46 001.c \ 80 001.c \
@@ -71,7 +105,8 @@ gnunet_tutorial_examples = \
71 026.c 105 026.c
72 106
73info_TEXINFOS = \ 107info_TEXINFOS = \
74 gnunet.texi 108 gnunet.texi \
109 gnunet-c-tutorial.texi
75 110
76# It seems as if either we still have gnunet-c-tutorial markup issues 111# It seems as if either we still have gnunet-c-tutorial markup issues
77# or we have issues that can only occur in systems which are not using Guix 112# or we have issues that can only occur in systems which are not using Guix
@@ -88,13 +123,15 @@ gnunet_TEXINFOS = \
88 123
89EXTRA_DIST = \ 124EXTRA_DIST = \
90 $(gnunet_TEXINFOS) \ 125 $(gnunet_TEXINFOS) \
91 $(gnunet_tutorial_examples) \
92 $(DOT_FILES) \
93 $(DOT_VECTOR_GRAPHICS) \
94 outdated-and-old-installation-instructions.txt \ 126 outdated-and-old-installation-instructions.txt \
95 gnunet-c-tutorial-v1.pdf \ 127 gnunet-c-tutorial-v1.pdf \
128 $(gnunet_tutorial_examples) \
96 README.txt 129 README.txt
97 130
131
132# $(DOT_FILES) \
133# $(DOT_VECTOR_GRAPHICS)
134
98daemon_lego_block.png: images/daemon_lego_block.svg 135daemon_lego_block.png: images/daemon_lego_block.svg
99 convert images/daemon_lego_block.svg images/daemon_lego_block.png && 136 convert images/daemon_lego_block.svg images/daemon_lego_block.png &&
100 pngcrush images/daemon_lego_block.png images/daemon_lego_block.png 137 pngcrush images/daemon_lego_block.png images/daemon_lego_block.png
@@ -161,21 +198,22 @@ doc-all-install: doc-all-give-me-the-noise
161 @install -m 0755 gnunet.info $(DESTDIR)/$(infodir) 198 @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
162 @cp -r gnunet $(DESTDIR)/$(docdir) 199 @cp -r gnunet $(DESTDIR)/$(docdir)
163 @cp -r gnunet-c-tutorial $(DESTDIR)/$(docdir) 200 @cp -r gnunet-c-tutorial $(DESTDIR)/$(docdir)
164 @cp -r images $(DESTDIR)/$(infoimagedir) 201
202# @cp -r images $(DESTDIR)/$(infoimagedir)
165 203
166# TODO: Add more to clean. 204# TODO: Add more to clean.
167clean: 205# clean:
168 @rm gnunet.pdf 206# @rm gnunet.pdf
169 @rm gnunet-c-tutorial.pdf 207# @rm gnunet-c-tutorial.pdf
170 @rm gnunet.info 208# @rm gnunet.info
171 @rm gnunet-c-tutorial.info 209# @rm gnunet-c-tutorial.info
172 210
173CLEANFILES = \ 211# CLEANFILES = \
174 gnunet.log \ 212# gnunet.log \
175 gnunet-c-tutorial.log \ 213# gnunet-c-tutorial.log \
176 $(wildcard *.aux) \ 214# $(wildcard *.aux) \
177 $(wildcard *.toc) \ 215# $(wildcard *.toc) \
178 $(wildcard *.cp) \ 216# $(wildcard *.cp) \
179 $(wildcard *.cps) 217# $(wildcard *.cps)
180 218
181.PHONY: version.texi 219.PHONY: version.texi