..

diff --git a/contrib/packages/guix/guix-env.scm b/contrib/packages/guix/guix-env.scm
index 1182eb08da05fafe60d2744e5b70e2919d3e860b..c62a713a2b8022fa031ac8864eaf72896618e57b 100644 (file)
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -146,7 +146,7 @@
          ("autoconf" ,autoconf)
          ("automake" ,automake)
          ("gnu-gettext" ,gnu-gettext)
-         ("texinfo" ,texinfo-5.2) ; Debian stable.
+         ("texinfo" ,texinfo-5) ; Debian stable: 5.2
          ("libtool" ,libtool)))
       ;; TODO:  To make use of out:debug, which carries the symbols,
       ;; this file needs to fixed.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7951bb26bf8836a07ed000b21582a683252d5f37..0fadf1a37997021301fbcd2baeff936b4c98426a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,42 +5,76 @@ docdir = $(datadir)/doc/gnunet/
 
 infoimagedir = $(infodir)/images
 
-DOT_FILES = images/$(wildcard *.dot)
-
-DOT_VECTOR_GRAPHICS =                                                          \
-       $(DOT_FILES:%.dot=%.eps)                                                \
-       $(DOT_FILES:%.dot=%.pdf)
-
-dist_infoimage_DATA =                                                          \
-       images/$(wildcard *.png)                                                \
-       images/$(wildcard *.svg)                                                \
-       $(DOT_FILES:%.dot=%.png)
-
-DOT_OPTIONS =                                                                  \
-       -Gratio=.9 -Gnodesep=.005 -Granksep=.00005                              \
-       -Nfontsite=9 -Nheight=.1 -Nwidth=.1
-
-.dot.png:
-       $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-.dot.pdf:
-       $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-.dot.eps:
-       $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-.png.eps:
-       $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
-       mv "$@-tmp.eps" "$@"
-
-pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
-info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
-ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)                \
-       $(top_srcdir)/%D%/images/coreutils-size-map.eps
-dvi-local: ps-local
+#DOT_FILES = images/$(wildcard *.dot)
+
+#DOT_VECTOR_GRAPHICS =                                                         \
+#      $(DOT_FILES:%.dot=%.eps)                                                \
+#      $(DOT_FILES:%.dot=%.pdf)
+
+dist_infoimage_DATA =                                          \
+       images/gnunet-gtk-0-10-gns-a-done.png                   \
+       images/gnunet-gtk-0-10-gns-a.png                        \
+       images/daemon_lego_block.png                            \
+       images/gnunet-gtk-0-10-gns.png                          \
+       images/gnunet-0-10-peerinfo.png                         \
+       images/gnunet-gtk-0-10-identity.png                     \
+       images/gnunet-fs-gtk-0-10-star-tab.png                  \
+       images/gnunet-gtk-0-10.png                              \
+       images/gnunet-gtk-0-10-download-area.png                \
+       images/gnunet-gtk-0-10-search-selected.png              \
+       images/gnunet-gtk-0-10-fs-menu.png                      \
+       images/gnunet-gtk-0-10-traffic.png                      \
+       images/gnunet-gtk-0-10-fs.png                           \
+       images/gnunet-namestore-gtk-phone.png                   \
+       images/gnunet-gtk-0-10-fs-publish-editing.png           \
+       images/gnunet-namestore-gtk-vpn.png                     \
+       images/gnunet-gtk-0-10-fs-published.png                 \
+       images/gnunet-setup-exit.png                            \
+       images/gnunet-gtk-0-10-fs-publish.png                   \
+       images/iceweasel-preferences.png                        \
+       images/gnunet-gtk-0-10-fs-publish-select.png            \
+       images/iceweasel-proxy.png                              \
+       images/gnunet-gtk-0-10-fs-publish-with-file_0.png       \
+       images/service_lego_block.png                           \
+       images/gnunet-gtk-0-10-fs-publish-with-file.png         \
+       images/service_stack.png                                \
+       images/gnunet-gtk-0-10-fs-search.png                    \
+       images/gnunet-tutorial-service.png                      \
+       images/gnunet-tutorial-system.png                       \
+       images/daemon_lego_block.svg                            \
+       images/lego_stack.svg                                   \
+       images/service_lego_block.svg                           \
+       images/structure.dot
+
+#      images/$(wildcard *.png)                                                \
+#      images/$(wildcard *.svg)
+#      $(DOT_FILES:%.dot=%.png)
+
+#DOT_OPTIONS =                                                                 \
+#      -Gratio=.9 -Gnodesep=.005 -Granksep=.00005                              \
+#      -Nfontsite=9 -Nheight=.1 -Nwidth=.1
+
+# .dot.png:
+#      $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+#      mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .dot.pdf:
+#      $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+#      mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .dot.eps:
+#      $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+#      mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .png.eps:
+#      $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
+#      mv "$@-tmp.eps" "$@"
+
+# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
+# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
+# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)                \
+#      $(top_srcdir)/%D%/images/coreutils-size-map.eps
+# dvi-local: ps-local
 
 gnunet_tutorial_examples =                                     \
        001.c                                                   \
@@ -71,7 +105,8 @@ gnunet_tutorial_examples =                                   \
        026.c
 
 info_TEXINFOS = \
-       gnunet.texi
+       gnunet.texi \
+       gnunet-c-tutorial.texi
 
 # It seems as if either we still have gnunet-c-tutorial markup issues
 # or we have issues that can only occur in systems which are not using Guix
@@ -88,13 +123,15 @@ gnunet_TEXINFOS = \
 
 EXTRA_DIST =                                                                   \
        $(gnunet_TEXINFOS)                                                      \
-       $(gnunet_tutorial_examples)                                             \
-       $(DOT_FILES)                                                            \
-       $(DOT_VECTOR_GRAPHICS)                                                  \
        outdated-and-old-installation-instructions.txt                          \
        gnunet-c-tutorial-v1.pdf                                                \
+       $(gnunet_tutorial_examples)                                             \
        README.txt
 
+
+#      $(DOT_FILES)                                                            \
+#      $(DOT_VECTOR_GRAPHICS)
+
 daemon_lego_block.png: images/daemon_lego_block.svg
        convert images/daemon_lego_block.svg images/daemon_lego_block.png &&
        pngcrush images/daemon_lego_block.png images/daemon_lego_block.png
@@ -161,21 +198,22 @@ doc-all-install: doc-all-give-me-the-noise
        @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
        @cp -r gnunet $(DESTDIR)/$(docdir)
        @cp -r gnunet-c-tutorial $(DESTDIR)/$(docdir)
-       @cp -r images $(DESTDIR)/$(infoimagedir)
+
+#      @cp -r images $(DESTDIR)/$(infoimagedir)
 
 # TODO: Add more to clean.
-clean:
-       @rm gnunet.pdf
-       @rm gnunet-c-tutorial.pdf
-       @rm gnunet.info
-       @rm gnunet-c-tutorial.info
-
-CLEANFILES =                                           \
-       gnunet.log                                      \
-       gnunet-c-tutorial.log                           \
-       $(wildcard *.aux)                               \
-       $(wildcard *.toc)                               \
-       $(wildcard *.cp)                                \
-       $(wildcard *.cps)
+# clean:
+#      @rm gnunet.pdf
+#      @rm gnunet-c-tutorial.pdf
+#      @rm gnunet.info
+#      @rm gnunet-c-tutorial.info
+
+# CLEANFILES =                                         \
+#      gnunet.log                                      \
+#      gnunet-c-tutorial.log                           \
+#      $(wildcard *.aux)                               \
+#      $(wildcard *.toc)                               \
+#      $(wildcard *.cp)                                \
+#      $(wildcard *.cps)
 
 .PHONY: version.texi