gnu: calibre: Add optipng as an input.

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

diff --git a/Makefile.am b/Makefile.am
index aca1852..fd6f972 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 # Copyright © 2017 Leo Famulari <leo@famulari.name>
 # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+# Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -46,6 +47,7 @@ MODULES =                                     \
   guix/hash.scm                                        \
   guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
+  guix/progress.scm                            \
   guix/combinators.scm                         \
   guix/memoization.scm                         \
   guix/utils.scm                               \
@@ -79,6 +81,8 @@ MODULES =                                     \
   guix/build-system/dub.scm                    \
   guix/build-system/emacs.scm                  \
   guix/build-system/font.scm                   \
+  guix/build-system/go.scm                     \
+  guix/build-system/meson.scm                  \
   guix/build-system/minify.scm                 \
   guix/build-system/asdf.scm                   \
   guix/build-system/glib-or-gtk.scm            \
@@ -102,12 +106,15 @@ MODULES =                                 \
   guix/ui.scm                                  \
   guix/build/ant-build-system.scm              \
   guix/build/download.scm                      \
+  guix/build/download-nar.scm                  \
   guix/build/cargo-build-system.scm            \
   guix/build/cmake-build-system.scm            \
   guix/build/dub-build-system.scm              \
   guix/build/emacs-build-system.scm            \
+  guix/build/meson-build-system.scm            \
   guix/build/minify-build-system.scm           \
   guix/build/font-build-system.scm             \
+  guix/build/go-build-system.scm               \
   guix/build/asdf-build-system.scm             \
   guix/build/git.scm                           \
   guix/build/hg.scm                            \
@@ -126,6 +133,7 @@ MODULES =                                   \
   guix/build/utils.scm                         \
   guix/build/union.scm                         \
   guix/build/profiles.scm                      \
+  guix/build/compile.scm                       \
   guix/build/pull.scm                          \
   guix/build/rpath.scm                         \
   guix/build/cvs.scm                           \
@@ -141,6 +149,7 @@ MODULES =                                   \
   guix/build/make-bootstrap.scm                        \
   guix/search-paths.scm                                \
   guix/packages.scm                            \
+  guix/import/print.scm                                \
   guix/import/utils.scm                                \
   guix/import/gnu.scm                          \
   guix/import/snix.scm                         \
@@ -164,12 +173,14 @@ MODULES =                                 \
   guix/scripts/authenticate.scm                        \
   guix/scripts/refresh.scm                     \
   guix/scripts/system.scm                      \
+  guix/scripts/system/search.scm               \
   guix/scripts/lint.scm                                \
   guix/scripts/challenge.scm                   \
   guix/scripts/import/cran.scm                 \
   guix/scripts/import/gnu.scm                  \
   guix/scripts/import/nix.scm                  \
   guix/scripts/import/hackage.scm              \
+  guix/scripts/import/json.scm                 \
   guix/scripts/import/elpa.scm                 \
   guix/scripts/import/texlive.scm              \
   guix/scripts/environment.scm                 \
@@ -191,6 +202,7 @@ MODULES +=                                  \
   guix/import/crate.scm                                \
   guix/import/gem.scm                          \
   guix/import/github.scm                       \
+  guix/import/gnome.scm                                \
   guix/import/json.scm                         \
   guix/import/pypi.scm                         \
   guix/import/stackage.scm                     \
@@ -271,6 +283,7 @@ SCM_TESTS =                                 \
   tests/hash.scm                               \
   tests/pk-crypto.scm                          \
   tests/pki.scm                                        \
+  tests/print.scm                              \
   tests/sets.scm                               \
   tests/modules.scm                            \
   tests/gnu-maintenance.scm                    \
@@ -704,6 +717,15 @@ hydra-jobs.scm: $(GOBJECTS)
          "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
        $(AM_V_at)mv "$@.tmp" "$@"
 
+# Compute the Cuirass jobs and write them in the target file.
+cuirass-jobs.scm: $(GOBJECTS)
+       $(AM_V_at)$(MKDIR_P) "`dirname "$@"`"
+       $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)"              \
+         "$(top_srcdir)/build-aux/hydra/evaluate.scm"                  \
+         "$(top_srcdir)/build-aux/cuirass/gnu-system.scm"              \
+         cuirass > "$@.tmp"
+       $(AM_V_at)mv "$@.tmp" "$@"
+
 .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained