Add 'guix challenge'.

[jackhill/guix/guix.git] / doc.am

diff --git a/doc.am b/doc.am
index d4ca0fc..e3a91cc 100644 (file)
--- a/doc.am
+++ b/doc.am
@@ -18,13 +18,27 @@
 # along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 info_TEXINFOS = doc/guix.texi
+
+DOT_FILES =                                    \
+  doc/images/bootstrap-graph.dot               \
+  doc/images/coreutils-graph.dot               \
+  doc/images/coreutils-bag-graph.dot           \
+  doc/images/service-graph.dot                 \
+  doc/images/dmd-graph.dot
+
+DOT_VECTOR_GRAPHICS =                          \
+  $(DOT_FILES:%.dot=%.eps)                     \
+  $(DOT_FILES:%.dot=%.pdf)
+
 EXTRA_DIST +=                                  \
   doc/contributing.texi                                \
   doc/emacs.texi                               \
   doc/fdl-1.3.texi                             \
-  doc/images/bootstrap-graph.dot               \
-  doc/images/bootstrap-graph.eps               \
-  doc/images/bootstrap-graph.pdf
+  $(DOT_FILES)                                 \
+  $(DOT_VECTOR_GRAPHICS)                       \
+  doc/images/coreutils-size-map.eps            \
+  doc/environment-gdb.scm                      \
+  doc/package-hello.scm
 
 OS_CONFIG_EXAMPLES_TEXI =                      \
   doc/os-config-bare-bones.texi                        \
@@ -40,7 +54,9 @@ doc/os-config-%.texi: gnu/system/examples/%.tmpl
        cp "$<" "$@"
 
 infoimagedir = $(infodir)/images
-dist_infoimage_DATA = doc/images/bootstrap-graph.png
+dist_infoimage_DATA =                          \
+  $(DOT_FILES:%.dot=%.png)                     \
+  doc/images/coreutils-size-map.png
 
 # Try hard to obtain an image size and aspect that's reasonable for inclusion
 # in an Info or PDF document.
@@ -60,27 +76,35 @@ DOT_OPTIONS =                                       \
        $(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
        mv "$@.tmp" "$@"
 
+.png.eps:
+       convert "$<" "$@-tmp.eps"
+       mv "$@-tmp.eps" "$@"
+
 # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
 # Extending").  Using the `-local' rules is imperfect, because they may be
 # triggered after the main rule.  Oh, well.
-pdf-local: $(top_srcdir)/doc/images/bootstrap-graph.pdf
-info-local: $(top_srcdir)/doc/images/bootstrap-graph.png
-ps-local: $(top_srcdir)/doc/images/bootstrap-graph.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)/doc/images/coreutils-size-map.eps
+dvi-local: ps-local
 
 \f
 # Manual pages.
 
-doc/guix.1: scripts/guix
+doc/guix.1: $(SUBCOMMANDS:%=guix/scripts/%.scm)
        -LANGUAGE= $(top_builddir)/pre-inst-env \
          $(HELP2MAN) --output="$@" guix
 
-doc/guix-daemon.1: guix-daemon
+# Note: Do not depend on 'guix-daemon' since that would trigger a rebuild even
+# for people building from a tarball.
+doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
        -LANGUAGE= $(top_builddir)/pre-inst-env \
          $(HELP2MAN) --output="$@" guix-daemon
 
 define subcommand-manual-target
 
-doc/guix-$(1).1: scripts/guix guix/scripts/$(1).go
+doc/guix-$(1).1: guix/scripts/$(1).scm
        -LANGUAGE= $(top_builddir)/pre-inst-env         \
          $(HELP2MAN) --output="$$@" "guix $(1)"
 
@@ -89,7 +113,9 @@ endef
 SUBCOMMANDS :=                                 \
   archive                                      \
   build                                                \
+  challenge                                    \
   download                                     \
+  edit                                         \
   environment                                  \
   gc                                           \
   hash                                         \
@@ -99,6 +125,7 @@ SUBCOMMANDS :=                                       \
   publish                                      \
   pull                                         \
   refresh                                      \
+  size                                         \
   system
 
 $(eval $(foreach subcommand,$(SUBCOMMANDS),                    \