Merge branch 'master' into core-updates

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

diff --git a/Makefile.am b/Makefile.am
index 9b9bdbf..847d850 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,21 +30,30 @@ MODULES =                                   \
   guix/scripts/import.scm                      \
   guix/scripts/package.scm                     \
   guix/scripts/gc.scm                          \
+  guix/scripts/hash.scm                                \
   guix/scripts/pull.scm                                \
+  guix/scripts/substitute-binary.scm           \
+  guix/scripts/refresh.scm                     \
   guix/base32.scm                              \
   guix/utils.scm                               \
+  guix/serialization.scm                       \
+  guix/nar.scm                                 \
   guix/derivations.scm                         \
   guix/download.scm                            \
   guix/gnu-maintenance.scm                     \
   guix/licenses.scm                            \
   guix/build-system.scm                                \
+  guix/build-system/cmake.scm                  \
   guix/build-system/gnu.scm                    \
   guix/build-system/perl.scm                   \
   guix/build-system/trivial.scm                        \
   guix/ftp-client.scm                          \
+  guix/web.scm                                 \
+  guix/gnupg.scm                               \
   guix/store.scm                               \
   guix/ui.scm                                  \
   guix/build/download.scm                      \
+  guix/build/cmake-build-system.scm            \
   guix/build/gnu-build-system.scm              \
   guix/build/perl-build-system.scm             \
   guix/build/utils.scm                         \
@@ -58,6 +67,7 @@ MODULES =                                     \
   gnu/packages/aspell.scm                      \
   gnu/packages/attr.scm                                \
   gnu/packages/autotools.scm                   \
+  gnu/packages/avahi.scm                       \
   gnu/packages/base.scm                                \
   gnu/packages/bash.scm                                \
   gnu/packages/bdb.scm                         \
@@ -65,20 +75,26 @@ MODULES =                                   \
   gnu/packages/bison.scm                       \
   gnu/packages/bootstrap.scm                   \
   gnu/packages/cdrom.scm                       \
+  gnu/packages/cflow.scm                       \
   gnu/packages/check.scm                       \
+  gnu/packages/cmake.scm                       \
   gnu/packages/compression.scm                 \
   gnu/packages/cpio.scm                                \
+  gnu/packages/cppi.scm                                \
   gnu/packages/cross-base.scm                  \
   gnu/packages/curl.scm                                \
   gnu/packages/cyrus-sasl.scm                  \
   gnu/packages/dejagnu.scm                     \
   gnu/packages/ddrescue.scm                    \
+  gnu/packages/dwm.scm                         \
   gnu/packages/ed.scm                          \
   gnu/packages/emacs.scm                       \
+  gnu/packages/fdisk.scm                       \
   gnu/packages/file.scm                                \
   gnu/packages/flex.scm                                \
   gnu/packages/fontutils.scm                   \
   gnu/packages/gawk.scm                                \
+  gnu/packages/gcc.scm                         \
   gnu/packages/gdb.scm                         \
   gnu/packages/gdbm.scm                                \
   gnu/packages/gettext.scm                     \
@@ -107,6 +123,7 @@ MODULES =                                   \
   gnu/packages/libffi.scm                      \
   gnu/packages/libidn.scm                      \
   gnu/packages/libjpeg.scm                     \
+  gnu/packages/libphidget.scm                  \
   gnu/packages/libpng.scm                      \
   gnu/packages/libsigsegv.scm                  \
   gnu/packages/libtiff.scm                     \
@@ -117,6 +134,8 @@ MODULES =                                   \
   gnu/packages/linux-initrd.scm                        \
   gnu/packages/lout.scm                                \
   gnu/packages/lsh.scm                         \
+  gnu/packages/lsof.scm                                \
+  gnu/packages/lua.scm                         \
   gnu/packages/m4.scm                          \
   gnu/packages/mailutils.scm                   \
   gnu/packages/make-bootstrap.scm              \
@@ -142,6 +161,7 @@ MODULES =                                   \
   gnu/packages/pth.scm                         \
   gnu/packages/python.scm                      \
   gnu/packages/qemu.scm                                \
+  gnu/packages/ratpoison.scm                   \
   gnu/packages/readline.scm                    \
   gnu/packages/recutils.scm                    \
   gnu/packages/rsync.scm                       \
@@ -163,6 +183,7 @@ MODULES =                                   \
   gnu/packages/tor.scm                         \
   gnu/packages/vim.scm                                 \
   gnu/packages/vpn.scm                         \
+  gnu/packages/w3m.scm                         \
   gnu/packages/wdiff.scm                       \
   gnu/packages/wget.scm                                \
   gnu/packages/which.scm                       \
@@ -185,6 +206,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/automake-skip-amhello-tests.patch       \
   gnu/packages/patches/bigloo-gc-shebangs.patch                        \
   gnu/packages/patches/binutils-ld-new-dtags.patch             \
+  gnu/packages/patches/cmake-fix-tests.patch                   \
   gnu/packages/patches/cpio-gets-undeclared.patch              \
   gnu/packages/patches/diffutils-gets-undeclared.patch         \
   gnu/packages/patches/emacs-configure-sh.patch                        \
@@ -196,6 +218,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/gettext-gets-undeclared.patch           \
   gnu/packages/patches/glib-tests-desktop.patch                        \
   gnu/packages/patches/glib-tests-homedir.patch                        \
+  gnu/packages/patches/glib-tests-prlimit.patch                        \
   gnu/packages/patches/glib-tests-timezone.patch               \
   gnu/packages/patches/glibc-bootstrap-system.patch            \
   gnu/packages/patches/glibc-no-ld-so-cache.patch              \
@@ -204,7 +227,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/guile-default-utf8.patch                        \
   gnu/packages/patches/guile-linux-syscalls.patch              \
   gnu/packages/patches/guile-relocatable.patch                 \
-  gnu/packages/patches/libapr-skip-getservbyname-test.patch    \
+  gnu/packages/patches/libapr-skip-getservbyname-test.patch    \
   gnu/packages/patches/libevent-dns-tests.patch                        \
   gnu/packages/patches/libtool-skip-tests.patch                        \
   gnu/packages/patches/lsh-guile-compat.patch                  \
@@ -216,14 +239,15 @@ dist_patch_DATA =                                         \
   gnu/packages/patches/make-impure-dirs.patch                  \
   gnu/packages/patches/mcron-install.patch                     \
   gnu/packages/patches/perl-no-sys-dirs.patch                  \
+  gnu/packages/patches/python-fix-dbm.patch                    \
   gnu/packages/patches/procps-make-3.82.patch                  \
   gnu/packages/patches/qemu-multiple-smb-shares.patch          \
   gnu/packages/patches/readline-link-ncurses.patch             \
-  gnu/packages/patches/shishi-gets-undeclared.patch            \
   gnu/packages/patches/tar-gets-undeclared.patch               \
-  gnu/packages/patches/tcsh-fix-autotest.patch                         \
+  gnu/packages/patches/tcsh-fix-autotest.patch                 \
   gnu/packages/patches/teckit-cstdio.patch                     \
   gnu/packages/patches/vpnc-script.patch                       \
+  gnu/packages/patches/w3m-fix-compile.patch                   \
   gnu/packages/patches/xpdf-constchar.patch
 
 bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
@@ -283,6 +307,7 @@ TESTS =                                             \
   tests/packages.scm                           \
   tests/snix.scm                               \
   tests/store.scm                              \
+  tests/nar.scm                                        \
   tests/union.scm                              \
   tests/guix-build.sh                          \
   tests/guix-download.sh                       \
@@ -306,6 +331,7 @@ EXTRA_DIST =                                        \
   .dir-locals.el                               \
   hydra.scm                                    \
   build-aux/download.scm                       \
+  build-aux/sync-synopses.scm                  \
   srfi/srfi-64.scm                             \
   srfi/srfi-64.upstream.scm                    \
   tests/test.drv                               \
@@ -353,3 +379,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS =                      \
   --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)"        \
   --with-nix-prefix="$(NIX_PREFIX)"            \
   --enable-daemon
+
+dist-hook:
+       -$(top_builddir)/pre-inst-env $(GUILE)          \
+          $(top_srcdir)/build-aux/sync-synopses.scm