HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into core-updates
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index ebe0f25..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.
@@ -27,23 +27,19 @@ nodist_noinst_SCRIPTS =                             \
 include gnu-system.am
 
 MODULES =                                      \
-  guix/scripts/build.scm                       \
-  guix/scripts/download.scm                    \
-  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/records.scm                             \
   guix/hash.scm                                        \
+  guix/pk-crypto.scm                           \
+  guix/pki.scm                                 \
   guix/utils.scm                               \
+  guix/download.scm                            \
+  guix/git-download.scm                                \
+  guix/monads.scm                              \
+  guix/profiles.scm                            \
   guix/serialization.scm                       \
   guix/nar.scm                                 \
   guix/derivations.scm                         \
-  guix/download.scm                            \
   guix/gnu-maintenance.scm                     \
   guix/licenses.scm                            \
   guix/build-system.scm                                \
@@ -59,21 +55,45 @@ 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                      \
+  guix/build/linux-initrd.scm                  \
   guix/build/perl-build-system.scm             \
   guix/build/python-build-system.scm           \
   guix/build/utils.scm                         \
   guix/build/union.scm                         \
+  guix/build/pull.scm                          \
   guix/build/rpath.scm                         \
   guix/packages.scm                            \
   guix/snix.scm                                        \
+  guix/scripts/download.scm                    \
+  guix/scripts/build.scm                       \
+  guix/scripts/archive.scm                     \
+  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/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
+guix/download.go: guix/build/download.go
 
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
@@ -93,10 +113,16 @@ srfi/srfi-37.scm: srfi/srfi-37.scm.in
 
 endif INSTALL_SRFI_37
 
+# Handy way to remove the .go files without removing all the rest.
+clean-go:
+       -$(RM) -f $(GOBJECTS)
+
 
 SCM_TESTS =                                    \
   tests/base32.scm                             \
   tests/hash.scm                               \
+  tests/pk-crypto.scm                          \
+  tests/pki.scm                                        \
   tests/builders.scm                           \
   tests/derivations.scm                                \
   tests/ui.scm                                 \
@@ -106,15 +132,26 @@ SCM_TESTS =                                       \
   tests/packages.scm                           \
   tests/snix.scm                               \
   tests/store.scm                              \
+  tests/monads.scm                             \
   tests/nar.scm                                        \
-  tests/union.scm
+  tests/union.scm                              \
+  tests/profiles.scm
 
 SH_TESTS =                                     \
   tests/guix-build.sh                          \
   tests/guix-download.sh                       \
   tests/guix-gc.sh                             \
   tests/guix-hash.sh                           \
-  tests/guix-package.sh
+  tests/guix-package.sh                                \
+  tests/guix-archive.sh                                \
+  tests/guix-authenticate.sh
+
+if BUILD_DAEMON
+
+SH_TESTS += tests/guix-register.sh
+
+endif BUILD_DAEMON
+
 
 TESTS = $(SCM_TESTS) $(SH_TESTS)
 
@@ -146,16 +183,26 @@ EXTRA_DIST =                                      \
   build-aux/check-available-binaries.scm       \
   build-aux/download.scm                       \
   build-aux/list-packages.scm                  \
-  build-aux/sync-synopses.scm                  \
+  build-aux/sync-descriptions.scm              \
   srfi/srfi-37.scm.in                          \
   srfi/srfi-64.scm                             \
   srfi/srfi-64.upstream.scm                    \
   tests/test.drv                               \
+  tests/signing-key.pub                                \
+  tests/signing-key.sec                                \
   build-aux/config.rpath                       \
   bootstrap                                    \
   release.nix                                  \
   $(TESTS)
 
+if !BUILD_DAEMON_OFFLOAD
+
+EXTRA_DIST +=                                  \
+  guix/scripts/offload.scm
+
+endif !BUILD_DAEMON_OFFLOAD
+
+
 CLEANFILES =                                   \
   $(GOBJECTS)                                  \
   $(SCM_TESTS:tests/%.scm=%.log)
@@ -185,7 +232,9 @@ SUFFIXES = .go
 guix_install_go_files = install-nobase_nodist_guilemoduleDATA
 $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
 
-SUBDIRS = doc po
+SUBDIRS = po
+
+include doc.am
 
 if BUILD_DAEMON
 
@@ -199,12 +248,12 @@ AM_DISTCHECK_CONFIGURE_FLAGS =                    \
   --with-nix-prefix="$(NIX_PREFIX)"            \
   --enable-daemon
 
-dist-hook: sync-synopses gen-ChangeLog assert-no-store-file-names
+dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
 distcheck-hook: assert-binaries-available
 
-sync-synopses:
+sync-descriptions:
        -$(top_builddir)/pre-inst-env $(GUILE)          \
-          $(top_srcdir)/build-aux/sync-synopses.scm
+          $(top_srcdir)/build-aux/sync-descriptions.scm
 
 gen-ChangeLog:
        if test -d .git; then                           \
@@ -214,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) ;                           \
@@ -228,5 +277,5 @@ assert-binaries-available:
        $(top_builddir)/pre-inst-env "$(GUILE)"                         \
          "$(top_srcdir)/build-aux/check-available-binaries.scm"
 
-.PHONY: sync-synopses gen-ChangeLog
+.PHONY: sync-descriptions gen-ChangeLog clean-go
 .PHONY: assert-no-store-file-names assert-binaries-available
jackhill's copy of GNU Guix: https://guix.gnu.org/