diff options
author | ng0 <ng0@infotropique.org> | 2017-09-30 10:38:49 +0000 |
---|---|---|
committer | ng0 <ng0@infotropique.org> | 2017-09-30 10:38:49 +0000 |
commit | 90a2295c1004f57668b491908d304a986cc87d52 (patch) | |
tree | 02279ffe562adc56bc771cf65450070819973870 | |
parent | dc629f387ee54f67286ae22fe73b8f4498e0e8d6 (diff) | |
download | gnunet-90a2295c1004f57668b491908d304a986cc87d52.tar.gz gnunet-90a2295c1004f57668b491908d304a986cc87d52.zip |
build-process: pass '--enable-documentation' to ONLY build the documentation.
This obviously defaults to NO.
Furthermore add DISTCLEANFILES to 'doc/Makefile.am'.
Adjust contrib/packages/guix/gnunet-doc.scm to it.
-rw-r--r-- | Makefile.am | 7 | ||||
-rw-r--r-- | configure.ac | 17 | ||||
-rw-r--r-- | contrib/packages/guix/gnunet-doc.scm | 4 | ||||
-rw-r--r-- | doc/Makefile.am | 49 | ||||
-rw-r--r-- | doc/README.txt | 2 |
5 files changed, 58 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 567e7b5ff..0466fcc10 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,6 +1,11 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
3 | SUBDIRS = doc m4 src po pkgconfig | 3 | |
4 | if DOC_ONLY | ||
5 | SUBDIRS = doc m4 po pkgconfig | ||
6 | else | ||
7 | SUBDIRS = doc m4 src po pkgconfig | ||
8 | endif | ||
4 | 9 | ||
5 | if !TALER_ONLY | 10 | if !TALER_ONLY |
6 | SUBDIRS += contrib | 11 | SUBDIRS += contrib |
diff --git a/configure.ac b/configure.ac index 101fc77cb..9d1fb9ab3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -565,6 +565,23 @@ AC_CHECK_LIB([kvm],[kvm_open]) | |||
565 | AC_CHECK_LIB([kstat],[kstat_open]) | 565 | AC_CHECK_LIB([kstat],[kstat_open]) |
566 | 566 | ||
567 | 567 | ||
568 | # should the build process be restricted to only building | ||
569 | # the documentation? | ||
570 | AC_MSG_CHECKING(whether to build documentation ONLY) | ||
571 | AC_ARG_ENABLE([documentation], | ||
572 | [AS_HELP_STRING([--enable-documentation], [only build the documentation])], | ||
573 | [doc_only=${enableval}], | ||
574 | [doc_only=no]) | ||
575 | AC_MSG_RESULT($doc_only) | ||
576 | if test "x$doc_only" = "xyes" | ||
577 | then | ||
578 | AM_CONDITIONAL([DOC_ONLY],true) | ||
579 | AC_DEFINE([DOC_ONLY],[1],[Building the documentation]) | ||
580 | else | ||
581 | AM_CONDITIONAL([DOC_ONLY],false) | ||
582 | AC_DEFINE([DOC_ONLY],[0],[Canonical compilation]) | ||
583 | fi | ||
584 | |||
568 | # should the build process be restricted to the code required | 585 | # should the build process be restricted to the code required |
569 | # for GNU Taler wallets? | 586 | # for GNU Taler wallets? |
570 | AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY) | 587 | AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY) |
diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm index a988e1125..9974c1b51 100644 --- a/contrib/packages/guix/gnunet-doc.scm +++ b/contrib/packages/guix/gnunet-doc.scm | |||
@@ -128,7 +128,9 @@ | |||
128 | ("texinfo-5" ,texinfo-5) ; Debian stable | 128 | ("texinfo-5" ,texinfo-5) ; Debian stable |
129 | ("libtool" ,libtool))) | 129 | ("libtool" ,libtool))) |
130 | (arguments | 130 | (arguments |
131 | `(#:tests? #f ;Don't run tests | 131 | `(#:configure-flags |
132 | (list "--enable-documentation") | ||
133 | #:tests? #f ;Don't run tests | ||
132 | #:phases | 134 | #:phases |
133 | (modify-phases %standard-phases | 135 | (modify-phases %standard-phases |
134 | (add-after 'unpack 'autoconf | 136 | (add-after 'unpack 'autoconf |
diff --git a/doc/Makefile.am b/doc/Makefile.am index 0fadf1a37..1a8bb64b9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -104,34 +104,40 @@ gnunet_tutorial_examples = \ | |||
104 | 025.c \ | 104 | 025.c \ |
105 | 026.c | 105 | 026.c |
106 | 106 | ||
107 | info_TEXINFOS = \ | 107 | info_TEXINFOS = \ |
108 | gnunet.texi \ | 108 | gnunet.texi \ |
109 | gnunet-c-tutorial.texi | 109 | gnunet-c-tutorial.texi |
110 | 110 | ||
111 | # It seems as if either we still have gnunet-c-tutorial markup issues | 111 | gnunet_TEXINFOS = \ |
112 | # or we have issues that can only occur in systems which are not using Guix | 112 | chapters/developer.texi \ |
113 | # or we have version incompabilities. | 113 | chapters/installation.texi \ |
114 | # gnunet-c-tutorial.texi | 114 | chapters/philosophy.texi \ |
115 | 115 | chapters/user.texi \ | |
116 | gnunet_TEXINFOS = \ | 116 | fdl-1.3.texi \ |
117 | chapters/developer.texi \ | ||
118 | chapters/installation.texi \ | ||
119 | chapters/philosophy.texi \ | ||
120 | chapters/user.texi \ | ||
121 | fdl-1.3.texi \ | ||
122 | gpl-3.0.texi | 117 | gpl-3.0.texi |
123 | 118 | ||
124 | EXTRA_DIST = \ | 119 | EXTRA_DIST = \ |
125 | $(gnunet_TEXINFOS) \ | 120 | $(gnunet_TEXINFOS) \ |
126 | outdated-and-old-installation-instructions.txt \ | 121 | outdated-and-old-installation-instructions.txt \ |
127 | gnunet-c-tutorial-v1.pdf \ | 122 | gnunet-c-tutorial-v1.pdf \ |
128 | $(gnunet_tutorial_examples) \ | 123 | $(gnunet_tutorial_examples) \ |
129 | README.txt | 124 | README.txt |
130 | 125 | ||
131 | 126 | ||
132 | # $(DOT_FILES) \ | 127 | # $(DOT_FILES) \ |
133 | # $(DOT_VECTOR_GRAPHICS) | 128 | # $(DOT_VECTOR_GRAPHICS) |
134 | 129 | ||
130 | DISTCLEANFILES = \ | ||
131 | gnunet.cps \ | ||
132 | gnunet-c-tutorial.cps \ | ||
133 | chapters/developer.cps \ | ||
134 | chapters/installation.cps \ | ||
135 | chapter/philosophy.cps \ | ||
136 | chapters/user.cps \ | ||
137 | fdl-1.3.cps \ | ||
138 | gpl-3.0.cps | ||
139 | |||
140 | # if HAVE_EXTENDED_DOCUMENTATION_BUILDING | ||
135 | daemon_lego_block.png: images/daemon_lego_block.svg | 141 | daemon_lego_block.png: images/daemon_lego_block.svg |
136 | convert images/daemon_lego_block.svg images/daemon_lego_block.png && | 142 | convert images/daemon_lego_block.svg images/daemon_lego_block.png && |
137 | pngcrush images/daemon_lego_block.png images/daemon_lego_block.png | 143 | pngcrush images/daemon_lego_block.png images/daemon_lego_block.png |
@@ -217,3 +223,10 @@ doc-all-install: doc-all-give-me-the-noise | |||
217 | # $(wildcard *.cps) | 223 | # $(wildcard *.cps) |
218 | 224 | ||
219 | .PHONY: version.texi | 225 | .PHONY: version.texi |
226 | # if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF | ||
227 | |||
228 | # if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML | ||
229 | |||
230 | # endif | ||
231 | # endif | ||
232 | # endif | ||
diff --git a/doc/README.txt b/doc/README.txt index 2abe479dd..fbbc24424 100644 --- a/doc/README.txt +++ b/doc/README.txt | |||
@@ -14,7 +14,7 @@ guix environment gnunet-doc | |||
14 | 14 | ||
15 | You need to have Texinfo and Texlive in your path. | 15 | You need to have Texinfo and Texlive in your path. |
16 | sh bootstrap | 16 | sh bootstrap |
17 | ./configure | 17 | ./configure --enable-documentation |
18 | cd doc | 18 | cd doc |
19 | make doc-all-give-me-the-noise | 19 | make doc-all-give-me-the-noise |
20 | 20 | ||