From 7f07f09d52aed7c449a330d8a82c1280776e49e0 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 21 Oct 2017 16:37:12 +0000 Subject: [PATCH] move docmentation to separate folder --- contrib/packages/guix/gnunet-doc.scm | 6 +- doc/Makefile.am | 216 +----------------- doc/documentation/Makefile.am | 214 +++++++++++++++++ doc/{ => documentation}/README.txt | 0 .../chapters/developer.texi | 0 .../chapters/installation.texi | 0 .../chapters/philosophy.texi | 0 doc/{ => documentation}/chapters/user.texi | 0 .../chapters/vocabulary.texi | 0 doc/{ => documentation}/docstyle.css | 0 doc/{ => documentation}/fdl-1.3.texi | 0 .../gnunet-c-tutorial.texi | 0 doc/{ => documentation}/gnunet.texi | 0 doc/{ => documentation}/gpl-3.0.texi | 0 .../images/daemon_lego_block.png | Bin .../images/daemon_lego_block.svg | 0 .../images/gnunet-0-10-peerinfo.png | Bin .../images/gnunet-fs-gtk-0-10-star-tab.png | Bin .../images/gnunet-gtk-0-10-download-area.png | Bin .../images/gnunet-gtk-0-10-fs-menu.png | Bin .../gnunet-gtk-0-10-fs-publish-editing.png | Bin .../gnunet-gtk-0-10-fs-publish-select.png | Bin .../gnunet-gtk-0-10-fs-publish-with-file.png | Bin ...gnunet-gtk-0-10-fs-publish-with-file_0.png | Bin .../images/gnunet-gtk-0-10-fs-publish.png | Bin .../images/gnunet-gtk-0-10-fs-published.png | Bin .../images/gnunet-gtk-0-10-fs-search.png | Bin .../images/gnunet-gtk-0-10-fs.png | Bin .../images/gnunet-gtk-0-10-gns-a-done.png | Bin .../images/gnunet-gtk-0-10-gns-a.png | Bin .../images/gnunet-gtk-0-10-gns.png | Bin .../images/gnunet-gtk-0-10-identity.png | Bin .../gnunet-gtk-0-10-search-selected.png | Bin .../images/gnunet-gtk-0-10-traffic.png | Bin .../images/gnunet-gtk-0-10.png | Bin .../images/gnunet-namestore-gtk-phone.png | Bin .../images/gnunet-namestore-gtk-vpn.png | Bin .../images/gnunet-setup-exit.png | Bin .../images/gnunet-tutorial-service.png | Bin .../images/gnunet-tutorial-system.png | Bin .../images/iceweasel-preferences.png | Bin .../images/iceweasel-proxy.png | Bin doc/{ => documentation}/images/lego_stack.svg | 0 .../images/service_lego_block.png | Bin .../images/service_lego_block.svg | 0 .../images/service_stack.png | Bin doc/{ => documentation}/images/structure.dot | 0 doc/{ => documentation}/testbed_test.c | 0 .../tutorial-examples/001.c | 0 .../tutorial-examples/002.c | 0 .../tutorial-examples/003.c | 0 .../tutorial-examples/004.c | 0 .../tutorial-examples/005.c | 0 .../tutorial-examples/006.c | 0 .../tutorial-examples/007.c | 0 .../tutorial-examples/008.c | 0 .../tutorial-examples/009.c | 0 .../tutorial-examples/010.c | 0 .../tutorial-examples/011.c | 0 .../tutorial-examples/012.c | 0 .../tutorial-examples/013.1.c | 0 .../tutorial-examples/013.c | 0 .../tutorial-examples/014.c | 0 .../tutorial-examples/015.c | 0 .../tutorial-examples/016.c | 0 .../tutorial-examples/017.c | 0 .../tutorial-examples/018.c | 0 .../tutorial-examples/019.c | 0 .../tutorial-examples/020.c | 0 .../tutorial-examples/021.c | 0 .../tutorial-examples/022.c | 0 .../tutorial-examples/023.c | 0 .../tutorial-examples/024.c | 0 .../tutorial-examples/025.c | 0 .../tutorial-examples/026.c | 0 75 files changed, 219 insertions(+), 217 deletions(-) create mode 100644 doc/documentation/Makefile.am rename doc/{ => documentation}/README.txt (100%) rename doc/{ => documentation}/chapters/developer.texi (100%) rename doc/{ => documentation}/chapters/installation.texi (100%) rename doc/{ => documentation}/chapters/philosophy.texi (100%) rename doc/{ => documentation}/chapters/user.texi (100%) rename doc/{ => documentation}/chapters/vocabulary.texi (100%) rename doc/{ => documentation}/docstyle.css (100%) rename doc/{ => documentation}/fdl-1.3.texi (100%) rename doc/{ => documentation}/gnunet-c-tutorial.texi (100%) rename doc/{ => documentation}/gnunet.texi (100%) rename doc/{ => documentation}/gpl-3.0.texi (100%) rename doc/{ => documentation}/images/daemon_lego_block.png (100%) rename doc/{ => documentation}/images/daemon_lego_block.svg (100%) rename doc/{ => documentation}/images/gnunet-0-10-peerinfo.png (100%) rename doc/{ => documentation}/images/gnunet-fs-gtk-0-10-star-tab.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-download-area.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-menu.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-publish-editing.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-publish-select.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-publish-with-file.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-publish-with-file_0.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-publish.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-published.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs-search.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-fs.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-gns-a-done.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-gns-a.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-gns.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-identity.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-search-selected.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10-traffic.png (100%) rename doc/{ => documentation}/images/gnunet-gtk-0-10.png (100%) rename doc/{ => documentation}/images/gnunet-namestore-gtk-phone.png (100%) rename doc/{ => documentation}/images/gnunet-namestore-gtk-vpn.png (100%) rename doc/{ => documentation}/images/gnunet-setup-exit.png (100%) rename doc/{ => documentation}/images/gnunet-tutorial-service.png (100%) rename doc/{ => documentation}/images/gnunet-tutorial-system.png (100%) rename doc/{ => documentation}/images/iceweasel-preferences.png (100%) rename doc/{ => documentation}/images/iceweasel-proxy.png (100%) rename doc/{ => documentation}/images/lego_stack.svg (100%) rename doc/{ => documentation}/images/service_lego_block.png (100%) rename doc/{ => documentation}/images/service_lego_block.svg (100%) rename doc/{ => documentation}/images/service_stack.png (100%) rename doc/{ => documentation}/images/structure.dot (100%) rename doc/{ => documentation}/testbed_test.c (100%) rename doc/{ => documentation}/tutorial-examples/001.c (100%) rename doc/{ => documentation}/tutorial-examples/002.c (100%) rename doc/{ => documentation}/tutorial-examples/003.c (100%) rename doc/{ => documentation}/tutorial-examples/004.c (100%) rename doc/{ => documentation}/tutorial-examples/005.c (100%) rename doc/{ => documentation}/tutorial-examples/006.c (100%) rename doc/{ => documentation}/tutorial-examples/007.c (100%) rename doc/{ => documentation}/tutorial-examples/008.c (100%) rename doc/{ => documentation}/tutorial-examples/009.c (100%) rename doc/{ => documentation}/tutorial-examples/010.c (100%) rename doc/{ => documentation}/tutorial-examples/011.c (100%) rename doc/{ => documentation}/tutorial-examples/012.c (100%) rename doc/{ => documentation}/tutorial-examples/013.1.c (100%) rename doc/{ => documentation}/tutorial-examples/013.c (100%) rename doc/{ => documentation}/tutorial-examples/014.c (100%) rename doc/{ => documentation}/tutorial-examples/015.c (100%) rename doc/{ => documentation}/tutorial-examples/016.c (100%) rename doc/{ => documentation}/tutorial-examples/017.c (100%) rename doc/{ => documentation}/tutorial-examples/018.c (100%) rename doc/{ => documentation}/tutorial-examples/019.c (100%) rename doc/{ => documentation}/tutorial-examples/020.c (100%) rename doc/{ => documentation}/tutorial-examples/021.c (100%) rename doc/{ => documentation}/tutorial-examples/022.c (100%) rename doc/{ => documentation}/tutorial-examples/023.c (100%) rename doc/{ => documentation}/tutorial-examples/024.c (100%) rename doc/{ => documentation}/tutorial-examples/025.c (100%) rename doc/{ => documentation}/tutorial-examples/026.c (100%) diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm index 98ab0ede7..b7b0156a0 100644 --- a/contrib/packages/guix/gnunet-doc.scm +++ b/contrib/packages/guix/gnunet-doc.scm @@ -94,7 +94,7 @@ ("gnurl" ,gnurl) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged. + ("gnutls/dane" ,gnutls/dane) ("libextractor" ,libextractor) ("libgcrypt" ,libgcrypt) ("libidn" ,libidn) @@ -109,7 +109,7 @@ ("mysql" ,mysql) ("zlib" ,zlib) ("perl" ,perl) - ("python" ,python) ; tests and gnunet-qr + ("python-2" ,python-2) ; tests and gnunet-qr ("jansson" ,jansson) ("nss" ,nss) ("glib" ,glib "bin") @@ -143,7 +143,7 @@ (zero? (system* "sh" "bootstrap")))) (replace 'build (lambda _ - (chdir "doc") + (chdir "doc/documentation") (zero? (system* "make" "pdf")) (zero? (system* "make" "html")) (zero? (system* "make" "info")))) diff --git a/doc/Makefile.am b/doc/Makefile.am index bb0c5e0bf..f84c66753 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,219 +1,7 @@ # This Makefile.am is in the public domain -SUBDIRS = man doxygen - -docdir = $(datadir)/doc/gnunet/ - -infoimagedir = $(infodir)/images - -#DOT_FILES = images/$(wildcard *.dot) - -#DOT_VECTOR_GRAPHICS = \ -# $(DOT_FILES:%.dot=%.eps) \ -# $(DOT_FILES:%.dot=%.pdf) - -AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=docstyle.css - -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 \ - 002.c \ - 003.c \ - 004.c \ - 005.c \ - 006.c \ - 007.c \ - 008.c \ - 009.c \ - 010.c \ - 011.c \ - 012.c \ - 013.c \ - 013.1.c \ - 014.c \ - 015.c \ - 016.c \ - 017.c \ - 018.c \ - 019.c \ - 020.c \ - 021.c \ - 022.c \ - 023.c \ - 024.c \ - 025.c \ - 026.c - -info_TEXINFOS = \ - gnunet.texi \ - gnunet-c-tutorial.texi - -gnunet_TEXINFOS = \ - chapters/developer.texi \ - chapters/installation.texi \ - chapters/philosophy.texi \ - chapters/user.texi \ - chapters/vocabulary.texi \ - fdl-1.3.texi \ - gpl-3.0.texi +SUBDIRS = man doxygen documentation EXTRA_DIST = \ - $(gnunet_TEXINFOS) \ outdated-and-old-installation-instructions.txt \ gnunet-c-tutorial-v1.pdf \ - $(gnunet_tutorial_examples) \ - README.txt \ - docstyle.css - - -# $(DOT_FILES) \ -# $(DOT_VECTOR_GRAPHICS) - -DISTCLEANFILES = \ - gnunet.cps \ - gnunet-c-tutorial.cps \ - chapters/developer.cps \ - chapters/installation.cps \ - chapter/philosophy.cps \ - chapters/user.cps \ - fdl-1.3.cps \ - gpl-3.0.cps - -# if HAVE_EXTENDED_DOCUMENTATION_BUILDING -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 - -service_lego_block.png: images/service_lego_block.svg - convert images/service_lego_block.svg images/service_lego_block.png && - pngcrush images/service_lego_block.png images/serivce_lego_block.png - -lego_stack.png: images/lego_stack.svg - convert images/lego_stack.svg images/lego_stack.png && - pngcrush images/lego_stack.png images/lego_stack.png - -# FIXME: The usage of 'date' strings causes a warning. -# version.texi: -# echo "@set UPDATED $(date +'%d %B %Y')" > $@ -# echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@ -# echo "@set EDITION $(PACKAGE_VERSION)" >> $@ -# echo "@set VERSION $(PACKAGE_VERSION)" >> $@ - -# Workaround for makeinfo error. Whcih in turn introduces more -# date-related 'warnings'. Well. -version2.texi: - echo "@set UPDATED $(date +'%d %B %Y')" > $@ - echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@ - echo "@set EDITION $(PACKAGE_VERSION)" >> $@ - echo "@set VERSION $(PACKAGE_VERSION)" >> $@ - -# FIXME: rm *.html and *.pdf -#doc-clean: -# @rm *.aux *.log *.toc *.cp *.cps - -doc-all-install: - @mkdir -p $(DESTDIR)/$(docdir) - @mkdir -p $(DESTDIR)/$(infoimagedir) - @mkdir -p $(DESTDIR)/$(infodir) - @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir) - @install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir) - @install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir) - @install -m 0755 gnunet.info $(DESTDIR)/$(infodir) - @install gnunet.html $(DESTDIR)/$(docdir) - @install gnunet-c-tutorial.html $(DESTDIR)/$(docdir) - -# @cp -r images $(DESTDIR)/$(infoimagedir) - -# TODO: Add more to clean. -clean: - @rm gnunet.pdf - @rm gnunet.html - @rm gnunet.info - @rm gnunet.info-1 - @rm gnunet.info-2 - @rm gnunet.info-3 - @rm gnunet-c-tutorial.pdf - @rm gnunet-c-tutorial.info - @rm gnunet-c-tutorial.html - @rm -r gnunet.t2p - @rm -r gnunet-c-tutorial.t2p - -# CLEANFILES = \ -# gnunet.log \ -# gnunet-c-tutorial.log \ -# $(wildcard *.aux) \ -# $(wildcard *.toc) \ -# $(wildcard *.cp) \ -# $(wildcard *.cps) - -#.PHONY: version.texi -# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF - -# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML - -# endif -# endif -# endif + README.txt diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am new file mode 100644 index 000000000..21852a9c3 --- /dev/null +++ b/doc/documentation/Makefile.am @@ -0,0 +1,214 @@ +# This Makefile.am is in the public domain +docdir = $(datadir)/doc/gnunet/ + +infoimagedir = $(infodir)/images + +#DOT_FILES = images/$(wildcard *.dot) + +#DOT_VECTOR_GRAPHICS = \ +# $(DOT_FILES:%.dot=%.eps) \ +# $(DOT_FILES:%.dot=%.pdf) + +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=docstyle.css + +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 \ + 002.c \ + 003.c \ + 004.c \ + 005.c \ + 006.c \ + 007.c \ + 008.c \ + 009.c \ + 010.c \ + 011.c \ + 012.c \ + 013.c \ + 013.1.c \ + 014.c \ + 015.c \ + 016.c \ + 017.c \ + 018.c \ + 019.c \ + 020.c \ + 021.c \ + 022.c \ + 023.c \ + 024.c \ + 025.c \ + 026.c + +info_TEXINFOS = \ + gnunet.texi \ + gnunet-c-tutorial.texi + +gnunet_TEXINFOS = \ + chapters/developer.texi \ + chapters/installation.texi \ + chapters/philosophy.texi \ + chapters/user.texi \ + chapters/vocabulary.texi \ + fdl-1.3.texi \ + gpl-3.0.texi + +EXTRA_DIST = \ + $(gnunet_TEXINFOS) \ + $(gnunet_tutorial_examples) \ + docstyle.css + + +# $(DOT_FILES) \ +# $(DOT_VECTOR_GRAPHICS) + +DISTCLEANFILES = \ + gnunet.cps \ + gnunet-c-tutorial.cps \ + chapters/developer.cps \ + chapters/installation.cps \ + chapter/philosophy.cps \ + chapters/user.cps \ + fdl-1.3.cps \ + gpl-3.0.cps + +# if HAVE_EXTENDED_DOCUMENTATION_BUILDING +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 + +service_lego_block.png: images/service_lego_block.svg + convert images/service_lego_block.svg images/service_lego_block.png && + pngcrush images/service_lego_block.png images/serivce_lego_block.png + +lego_stack.png: images/lego_stack.svg + convert images/lego_stack.svg images/lego_stack.png && + pngcrush images/lego_stack.png images/lego_stack.png + +# FIXME: The usage of 'date' strings causes a warning. +# version.texi: +# echo "@set UPDATED $(date +'%d %B %Y')" > $@ +# echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@ +# echo "@set EDITION $(PACKAGE_VERSION)" >> $@ +# echo "@set VERSION $(PACKAGE_VERSION)" >> $@ + +# Workaround for makeinfo error. Whcih in turn introduces more +# date-related 'warnings'. Well. +version2.texi: + echo "@set UPDATED $(date +'%d %B %Y')" > $@ + echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@ + echo "@set EDITION $(PACKAGE_VERSION)" >> $@ + echo "@set VERSION $(PACKAGE_VERSION)" >> $@ + +# FIXME: rm *.html and *.pdf +#doc-clean: +# @rm *.aux *.log *.toc *.cp *.cps + +doc-all-install: + @mkdir -p $(DESTDIR)/$(docdir) + @mkdir -p $(DESTDIR)/$(infoimagedir) + @mkdir -p $(DESTDIR)/$(infodir) + @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir) + @install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir) + @install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir) + @install -m 0755 gnunet.info $(DESTDIR)/$(infodir) + @install gnunet.html $(DESTDIR)/$(docdir) + @install gnunet-c-tutorial.html $(DESTDIR)/$(docdir) + +# @cp -r images $(DESTDIR)/$(infoimagedir) + +# TODO: Add more to clean. +clean: + @rm gnunet.pdf + @rm gnunet.html + @rm gnunet.info + @rm gnunet.info-1 + @rm gnunet.info-2 + @rm gnunet.info-3 + @rm gnunet-c-tutorial.pdf + @rm gnunet-c-tutorial.info + @rm gnunet-c-tutorial.html + @rm -r gnunet.t2p + @rm -r gnunet-c-tutorial.t2p + +# CLEANFILES = \ +# gnunet.log \ +# gnunet-c-tutorial.log \ +# $(wildcard *.aux) \ +# $(wildcard *.toc) \ +# $(wildcard *.cp) \ +# $(wildcard *.cps) + +#.PHONY: version.texi +# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF + +# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML + +# endif +# endif +# endif diff --git a/doc/README.txt b/doc/documentation/README.txt similarity index 100% rename from doc/README.txt rename to doc/documentation/README.txt diff --git a/doc/chapters/developer.texi b/doc/documentation/chapters/developer.texi similarity index 100% rename from doc/chapters/developer.texi rename to doc/documentation/chapters/developer.texi diff --git a/doc/chapters/installation.texi b/doc/documentation/chapters/installation.texi similarity index 100% rename from doc/chapters/installation.texi rename to doc/documentation/chapters/installation.texi diff --git a/doc/chapters/philosophy.texi b/doc/documentation/chapters/philosophy.texi similarity index 100% rename from doc/chapters/philosophy.texi rename to doc/documentation/chapters/philosophy.texi diff --git a/doc/chapters/user.texi b/doc/documentation/chapters/user.texi similarity index 100% rename from doc/chapters/user.texi rename to doc/documentation/chapters/user.texi diff --git a/doc/chapters/vocabulary.texi b/doc/documentation/chapters/vocabulary.texi similarity index 100% rename from doc/chapters/vocabulary.texi rename to doc/documentation/chapters/vocabulary.texi diff --git a/doc/docstyle.css b/doc/documentation/docstyle.css similarity index 100% rename from doc/docstyle.css rename to doc/documentation/docstyle.css diff --git a/doc/fdl-1.3.texi b/doc/documentation/fdl-1.3.texi similarity index 100% rename from doc/fdl-1.3.texi rename to doc/documentation/fdl-1.3.texi diff --git a/doc/gnunet-c-tutorial.texi b/doc/documentation/gnunet-c-tutorial.texi similarity index 100% rename from doc/gnunet-c-tutorial.texi rename to doc/documentation/gnunet-c-tutorial.texi diff --git a/doc/gnunet.texi b/doc/documentation/gnunet.texi similarity index 100% rename from doc/gnunet.texi rename to doc/documentation/gnunet.texi diff --git a/doc/gpl-3.0.texi b/doc/documentation/gpl-3.0.texi similarity index 100% rename from doc/gpl-3.0.texi rename to doc/documentation/gpl-3.0.texi diff --git a/doc/images/daemon_lego_block.png b/doc/documentation/images/daemon_lego_block.png similarity index 100% rename from doc/images/daemon_lego_block.png rename to doc/documentation/images/daemon_lego_block.png diff --git a/doc/images/daemon_lego_block.svg b/doc/documentation/images/daemon_lego_block.svg similarity index 100% rename from doc/images/daemon_lego_block.svg rename to doc/documentation/images/daemon_lego_block.svg diff --git a/doc/images/gnunet-0-10-peerinfo.png b/doc/documentation/images/gnunet-0-10-peerinfo.png similarity index 100% rename from doc/images/gnunet-0-10-peerinfo.png rename to doc/documentation/images/gnunet-0-10-peerinfo.png diff --git a/doc/images/gnunet-fs-gtk-0-10-star-tab.png b/doc/documentation/images/gnunet-fs-gtk-0-10-star-tab.png similarity index 100% rename from doc/images/gnunet-fs-gtk-0-10-star-tab.png rename to doc/documentation/images/gnunet-fs-gtk-0-10-star-tab.png diff --git a/doc/images/gnunet-gtk-0-10-download-area.png b/doc/documentation/images/gnunet-gtk-0-10-download-area.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-download-area.png rename to doc/documentation/images/gnunet-gtk-0-10-download-area.png diff --git a/doc/images/gnunet-gtk-0-10-fs-menu.png b/doc/documentation/images/gnunet-gtk-0-10-fs-menu.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-menu.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-menu.png diff --git a/doc/images/gnunet-gtk-0-10-fs-publish-editing.png b/doc/documentation/images/gnunet-gtk-0-10-fs-publish-editing.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-publish-editing.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-publish-editing.png diff --git a/doc/images/gnunet-gtk-0-10-fs-publish-select.png b/doc/documentation/images/gnunet-gtk-0-10-fs-publish-select.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-publish-select.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-publish-select.png diff --git a/doc/images/gnunet-gtk-0-10-fs-publish-with-file.png b/doc/documentation/images/gnunet-gtk-0-10-fs-publish-with-file.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-publish-with-file.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-publish-with-file.png diff --git a/doc/images/gnunet-gtk-0-10-fs-publish-with-file_0.png b/doc/documentation/images/gnunet-gtk-0-10-fs-publish-with-file_0.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-publish-with-file_0.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-publish-with-file_0.png diff --git a/doc/images/gnunet-gtk-0-10-fs-publish.png b/doc/documentation/images/gnunet-gtk-0-10-fs-publish.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-publish.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-publish.png diff --git a/doc/images/gnunet-gtk-0-10-fs-published.png b/doc/documentation/images/gnunet-gtk-0-10-fs-published.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-published.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-published.png diff --git a/doc/images/gnunet-gtk-0-10-fs-search.png b/doc/documentation/images/gnunet-gtk-0-10-fs-search.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs-search.png rename to doc/documentation/images/gnunet-gtk-0-10-fs-search.png diff --git a/doc/images/gnunet-gtk-0-10-fs.png b/doc/documentation/images/gnunet-gtk-0-10-fs.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-fs.png rename to doc/documentation/images/gnunet-gtk-0-10-fs.png diff --git a/doc/images/gnunet-gtk-0-10-gns-a-done.png b/doc/documentation/images/gnunet-gtk-0-10-gns-a-done.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-gns-a-done.png rename to doc/documentation/images/gnunet-gtk-0-10-gns-a-done.png diff --git a/doc/images/gnunet-gtk-0-10-gns-a.png b/doc/documentation/images/gnunet-gtk-0-10-gns-a.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-gns-a.png rename to doc/documentation/images/gnunet-gtk-0-10-gns-a.png diff --git a/doc/images/gnunet-gtk-0-10-gns.png b/doc/documentation/images/gnunet-gtk-0-10-gns.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-gns.png rename to doc/documentation/images/gnunet-gtk-0-10-gns.png diff --git a/doc/images/gnunet-gtk-0-10-identity.png b/doc/documentation/images/gnunet-gtk-0-10-identity.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-identity.png rename to doc/documentation/images/gnunet-gtk-0-10-identity.png diff --git a/doc/images/gnunet-gtk-0-10-search-selected.png b/doc/documentation/images/gnunet-gtk-0-10-search-selected.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-search-selected.png rename to doc/documentation/images/gnunet-gtk-0-10-search-selected.png diff --git a/doc/images/gnunet-gtk-0-10-traffic.png b/doc/documentation/images/gnunet-gtk-0-10-traffic.png similarity index 100% rename from doc/images/gnunet-gtk-0-10-traffic.png rename to doc/documentation/images/gnunet-gtk-0-10-traffic.png diff --git a/doc/images/gnunet-gtk-0-10.png b/doc/documentation/images/gnunet-gtk-0-10.png similarity index 100% rename from doc/images/gnunet-gtk-0-10.png rename to doc/documentation/images/gnunet-gtk-0-10.png diff --git a/doc/images/gnunet-namestore-gtk-phone.png b/doc/documentation/images/gnunet-namestore-gtk-phone.png similarity index 100% rename from doc/images/gnunet-namestore-gtk-phone.png rename to doc/documentation/images/gnunet-namestore-gtk-phone.png diff --git a/doc/images/gnunet-namestore-gtk-vpn.png b/doc/documentation/images/gnunet-namestore-gtk-vpn.png similarity index 100% rename from doc/images/gnunet-namestore-gtk-vpn.png rename to doc/documentation/images/gnunet-namestore-gtk-vpn.png diff --git a/doc/images/gnunet-setup-exit.png b/doc/documentation/images/gnunet-setup-exit.png similarity index 100% rename from doc/images/gnunet-setup-exit.png rename to doc/documentation/images/gnunet-setup-exit.png diff --git a/doc/images/gnunet-tutorial-service.png b/doc/documentation/images/gnunet-tutorial-service.png similarity index 100% rename from doc/images/gnunet-tutorial-service.png rename to doc/documentation/images/gnunet-tutorial-service.png diff --git a/doc/images/gnunet-tutorial-system.png b/doc/documentation/images/gnunet-tutorial-system.png similarity index 100% rename from doc/images/gnunet-tutorial-system.png rename to doc/documentation/images/gnunet-tutorial-system.png diff --git a/doc/images/iceweasel-preferences.png b/doc/documentation/images/iceweasel-preferences.png similarity index 100% rename from doc/images/iceweasel-preferences.png rename to doc/documentation/images/iceweasel-preferences.png diff --git a/doc/images/iceweasel-proxy.png b/doc/documentation/images/iceweasel-proxy.png similarity index 100% rename from doc/images/iceweasel-proxy.png rename to doc/documentation/images/iceweasel-proxy.png diff --git a/doc/images/lego_stack.svg b/doc/documentation/images/lego_stack.svg similarity index 100% rename from doc/images/lego_stack.svg rename to doc/documentation/images/lego_stack.svg diff --git a/doc/images/service_lego_block.png b/doc/documentation/images/service_lego_block.png similarity index 100% rename from doc/images/service_lego_block.png rename to doc/documentation/images/service_lego_block.png diff --git a/doc/images/service_lego_block.svg b/doc/documentation/images/service_lego_block.svg similarity index 100% rename from doc/images/service_lego_block.svg rename to doc/documentation/images/service_lego_block.svg diff --git a/doc/images/service_stack.png b/doc/documentation/images/service_stack.png similarity index 100% rename from doc/images/service_stack.png rename to doc/documentation/images/service_stack.png diff --git a/doc/images/structure.dot b/doc/documentation/images/structure.dot similarity index 100% rename from doc/images/structure.dot rename to doc/documentation/images/structure.dot diff --git a/doc/testbed_test.c b/doc/documentation/testbed_test.c similarity index 100% rename from doc/testbed_test.c rename to doc/documentation/testbed_test.c diff --git a/doc/tutorial-examples/001.c b/doc/documentation/tutorial-examples/001.c similarity index 100% rename from doc/tutorial-examples/001.c rename to doc/documentation/tutorial-examples/001.c diff --git a/doc/tutorial-examples/002.c b/doc/documentation/tutorial-examples/002.c similarity index 100% rename from doc/tutorial-examples/002.c rename to doc/documentation/tutorial-examples/002.c diff --git a/doc/tutorial-examples/003.c b/doc/documentation/tutorial-examples/003.c similarity index 100% rename from doc/tutorial-examples/003.c rename to doc/documentation/tutorial-examples/003.c diff --git a/doc/tutorial-examples/004.c b/doc/documentation/tutorial-examples/004.c similarity index 100% rename from doc/tutorial-examples/004.c rename to doc/documentation/tutorial-examples/004.c diff --git a/doc/tutorial-examples/005.c b/doc/documentation/tutorial-examples/005.c similarity index 100% rename from doc/tutorial-examples/005.c rename to doc/documentation/tutorial-examples/005.c diff --git a/doc/tutorial-examples/006.c b/doc/documentation/tutorial-examples/006.c similarity index 100% rename from doc/tutorial-examples/006.c rename to doc/documentation/tutorial-examples/006.c diff --git a/doc/tutorial-examples/007.c b/doc/documentation/tutorial-examples/007.c similarity index 100% rename from doc/tutorial-examples/007.c rename to doc/documentation/tutorial-examples/007.c diff --git a/doc/tutorial-examples/008.c b/doc/documentation/tutorial-examples/008.c similarity index 100% rename from doc/tutorial-examples/008.c rename to doc/documentation/tutorial-examples/008.c diff --git a/doc/tutorial-examples/009.c b/doc/documentation/tutorial-examples/009.c similarity index 100% rename from doc/tutorial-examples/009.c rename to doc/documentation/tutorial-examples/009.c diff --git a/doc/tutorial-examples/010.c b/doc/documentation/tutorial-examples/010.c similarity index 100% rename from doc/tutorial-examples/010.c rename to doc/documentation/tutorial-examples/010.c diff --git a/doc/tutorial-examples/011.c b/doc/documentation/tutorial-examples/011.c similarity index 100% rename from doc/tutorial-examples/011.c rename to doc/documentation/tutorial-examples/011.c diff --git a/doc/tutorial-examples/012.c b/doc/documentation/tutorial-examples/012.c similarity index 100% rename from doc/tutorial-examples/012.c rename to doc/documentation/tutorial-examples/012.c diff --git a/doc/tutorial-examples/013.1.c b/doc/documentation/tutorial-examples/013.1.c similarity index 100% rename from doc/tutorial-examples/013.1.c rename to doc/documentation/tutorial-examples/013.1.c diff --git a/doc/tutorial-examples/013.c b/doc/documentation/tutorial-examples/013.c similarity index 100% rename from doc/tutorial-examples/013.c rename to doc/documentation/tutorial-examples/013.c diff --git a/doc/tutorial-examples/014.c b/doc/documentation/tutorial-examples/014.c similarity index 100% rename from doc/tutorial-examples/014.c rename to doc/documentation/tutorial-examples/014.c diff --git a/doc/tutorial-examples/015.c b/doc/documentation/tutorial-examples/015.c similarity index 100% rename from doc/tutorial-examples/015.c rename to doc/documentation/tutorial-examples/015.c diff --git a/doc/tutorial-examples/016.c b/doc/documentation/tutorial-examples/016.c similarity index 100% rename from doc/tutorial-examples/016.c rename to doc/documentation/tutorial-examples/016.c diff --git a/doc/tutorial-examples/017.c b/doc/documentation/tutorial-examples/017.c similarity index 100% rename from doc/tutorial-examples/017.c rename to doc/documentation/tutorial-examples/017.c diff --git a/doc/tutorial-examples/018.c b/doc/documentation/tutorial-examples/018.c similarity index 100% rename from doc/tutorial-examples/018.c rename to doc/documentation/tutorial-examples/018.c diff --git a/doc/tutorial-examples/019.c b/doc/documentation/tutorial-examples/019.c similarity index 100% rename from doc/tutorial-examples/019.c rename to doc/documentation/tutorial-examples/019.c diff --git a/doc/tutorial-examples/020.c b/doc/documentation/tutorial-examples/020.c similarity index 100% rename from doc/tutorial-examples/020.c rename to doc/documentation/tutorial-examples/020.c diff --git a/doc/tutorial-examples/021.c b/doc/documentation/tutorial-examples/021.c similarity index 100% rename from doc/tutorial-examples/021.c rename to doc/documentation/tutorial-examples/021.c diff --git a/doc/tutorial-examples/022.c b/doc/documentation/tutorial-examples/022.c similarity index 100% rename from doc/tutorial-examples/022.c rename to doc/documentation/tutorial-examples/022.c diff --git a/doc/tutorial-examples/023.c b/doc/documentation/tutorial-examples/023.c similarity index 100% rename from doc/tutorial-examples/023.c rename to doc/documentation/tutorial-examples/023.c diff --git a/doc/tutorial-examples/024.c b/doc/documentation/tutorial-examples/024.c similarity index 100% rename from doc/tutorial-examples/024.c rename to doc/documentation/tutorial-examples/024.c diff --git a/doc/tutorial-examples/025.c b/doc/documentation/tutorial-examples/025.c similarity index 100% rename from doc/tutorial-examples/025.c rename to doc/documentation/tutorial-examples/025.c diff --git a/doc/tutorial-examples/026.c b/doc/documentation/tutorial-examples/026.c similarity index 100% rename from doc/tutorial-examples/026.c rename to doc/documentation/tutorial-examples/026.c -- 2.25.1