Merge branch 'master' into core-updates

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

diff --git a/Makefile.am b/Makefile.am
index 6d6aba0..764332a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 #
 # This file is part of GNU Guix.
@@ -34,6 +34,7 @@ MODULES =                                     \
   guix/pki.scm                                 \
   guix/utils.scm                               \
   guix/download.scm                            \
+  guix/git-download.scm                                \
   guix/monads.scm                              \
   guix/profiles.scm                            \
   guix/serialization.scm                       \
@@ -54,6 +55,7 @@ MODULES =                                     \
   guix/ui.scm                                  \
   guix/build/download.scm                      \
   guix/build/cmake-build-system.scm            \
+  guix/build/git.scm                           \
   guix/build/gnome.scm                         \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
@@ -77,9 +79,17 @@ MODULES =                                    \
   guix/scripts/substitute-binary.scm           \
   guix/scripts/authenticate.scm                        \
   guix/scripts/refresh.scm                     \
+  guix/scripts/system.scm                      \
   guix.scm                                     \
   $(GNU_SYSTEM_MODULES)
 
+if BUILD_DAEMON_OFFLOAD
+
+MODULES +=                                     \
+  guix/scripts/offload.scm
+
+endif BUILD_DAEMON_OFFLOAD
+
 # Because of the autoload hack in (guix build download), we must build it
 # first to avoid errors on systems where (gnutls) is unavailable.
 guix/scripts/download.go: guix/build/download.go
@@ -185,6 +195,14 @@ EXTRA_DIST =                                       \
   release.nix                                  \
   $(TESTS)
 
+if !BUILD_DAEMON_OFFLOAD
+
+EXTRA_DIST +=                                  \
+  guix/scripts/offload.scm
+
+endif !BUILD_DAEMON_OFFLOAD
+
+
 CLEANFILES =                                   \
   $(GOBJECTS)                                  \
   $(SCM_TESTS:tests/%.scm=%.log)
@@ -245,7 +263,7 @@ gen-ChangeLog:
          mv $(distdir)/cl-t $(distdir)/ChangeLog;      \
        fi
 
-# Make sure we're not shipping a file that embeds a local /nix/store file name.
+# Make sure we're not shipping a file that embeds a local /gnu/store file name.
 assert-no-store-file-names:
        if grep -r --exclude=*.texi --exclude=*.info                            \
             "$(storedir)/[a-z0-9]{32}-" $(distdir) ;                           \