HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: clutter-gtk: Update to 1.6.6.
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 22ee938..760caed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
+# Copyright © 2015 Alex Kost <alezost@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -47,15 +48,20 @@ MODULES =                                   \
   guix/nar.scm                                 \
   guix/derivations.scm                         \
   guix/gnu-maintenance.scm                     \
+  guix/upstream.scm                            \
   guix/licenses.scm                            \
+  guix/graph.scm                               \
+  guix/cve.scm                                 \
   guix/build-system.scm                                \
   guix/build-system/cmake.scm                  \
+  guix/build-system/emacs.scm                  \
   guix/build-system/glib-or-gtk.scm            \
   guix/build-system/gnu.scm                    \
   guix/build-system/haskell.scm                        \
   guix/build-system/perl.scm                   \
   guix/build-system/python.scm                 \
   guix/build-system/waf.scm                    \
+  guix/build-system/r.scm                      \
   guix/build-system/ruby.scm                   \
   guix/build-system/trivial.scm                        \
   guix/ftp-client.scm                          \
@@ -68,12 +74,14 @@ MODULES =                                   \
   guix/ui.scm                                  \
   guix/build/download.scm                      \
   guix/build/cmake-build-system.scm            \
+  guix/build/emacs-build-system.scm            \
   guix/build/git.scm                           \
   guix/build/glib-or-gtk-build-system.scm      \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
   guix/build/perl-build-system.scm             \
   guix/build/python-build-system.scm           \
+  guix/build/r-build-system.scm                        \
   guix/build/ruby-build-system.scm             \
   guix/build/waf-build-system.scm              \
   guix/build/haskell-build-system.scm          \
@@ -85,7 +93,6 @@ MODULES =                                     \
   guix/build/rpath.scm                         \
   guix/build/cvs.scm                           \
   guix/build/svn.scm                           \
-  guix/build/syscalls.scm                      \
   guix/build/gremlin.scm                       \
   guix/build/emacs-utils.scm                   \
   guix/build/graft.scm                         \
@@ -95,7 +102,10 @@ MODULES =                                   \
   guix/import/gnu.scm                          \
   guix/import/snix.scm                         \
   guix/import/cabal.scm                                \
+  guix/import/cran.scm                         \
   guix/import/hackage.scm                      \
+  guix/import/elpa.scm                         \
+  guix/scripts.scm                             \
   guix/scripts/download.scm                    \
   guix/scripts/build.scm                       \
   guix/scripts/archive.scm                     \
@@ -109,16 +119,29 @@ MODULES =                                 \
   guix/scripts/refresh.scm                     \
   guix/scripts/system.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/elpa.scm                 \
   guix/scripts/environment.scm                 \
   guix/scripts/publish.scm                     \
   guix/scripts/edit.scm                                \
   guix/scripts/size.scm                                \
+  guix/scripts/graph.scm                       \
+  guix/scripts/container.scm                   \
+  guix/scripts/container/exec.scm              \
   guix.scm                                     \
   $(GNU_SYSTEM_MODULES)
 
+if BUILD_SYSCALLS_MODULE
+
+MODULES +=                                     \
+  guix/build/syscalls.scm
+
+endif
+
 if BUILD_DAEMON_OFFLOAD
 
 MODULES +=                                     \
@@ -176,6 +199,7 @@ SCM_TESTS =                                 \
   tests/pk-crypto.scm                          \
   tests/pki.scm                                        \
   tests/sets.scm                               \
+  tests/gnu-maintenance.scm                    \
   tests/substitute.scm                         \
   tests/builders.scm                           \
   tests/derivations.scm                                \
@@ -186,6 +210,8 @@ SCM_TESTS =                                 \
   tests/packages.scm                           \
   tests/snix.scm                               \
   tests/hackage.scm                            \
+  tests/cran.scm                               \
+  tests/elpa.scm                               \
   tests/store.scm                              \
   tests/monads.scm                             \
   tests/gexp.scm                               \
@@ -196,7 +222,14 @@ SCM_TESTS =                                        \
   tests/gremlin.scm                            \
   tests/lint.scm                               \
   tests/publish.scm                            \
-  tests/size.scm
+  tests/scripts.scm                            \
+  tests/size.scm                               \
+  tests/graph.scm                              \
+  tests/challenge.scm                          \
+  tests/cve.scm                                        \
+  tests/file-systems.scm                       \
+  tests/services.scm                           \
+  tests/containers.scm
 
 if HAVE_GUILE_JSON
 
@@ -205,11 +238,13 @@ MODULES +=                                        \
   guix/import/pypi.scm                         \
   guix/scripts/import/pypi.scm                 \
   guix/import/cpan.scm                         \
-  guix/scripts/import/cpan.scm
+  guix/scripts/import/gem.scm                  \
+  guix/import/gem.scm
 
 SCM_TESTS +=                                   \
   tests/pypi.scm                               \
-  tests/cpan.scm
+  tests/cpan.scm                               \
+  tests/gem.scm
 
 endif
 
@@ -223,6 +258,9 @@ SH_TESTS =                                  \
   tests/guix-system.sh                         \
   tests/guix-archive.sh                                \
   tests/guix-authenticate.sh                   \
+  tests/guix-environment.sh                    \
+  tests/guix-environment-container.sh          \
+  tests/guix-graph.sh                          \
   tests/guix-lint.sh
 
 if BUILD_DAEMON
@@ -261,6 +299,7 @@ EXTRA_DIST =                                                \
   HACKING                                              \
   ROADMAP                                              \
   TODO                                                 \
+  CODE-OF-CONDUCT                                      \
   .dir-locals.el                                       \
   build-aux/build-self.scm                             \
   build-aux/hydra/gnu-system.scm                       \
@@ -270,12 +309,14 @@ EXTRA_DIST =                                              \
   build-aux/check-final-inputs-self-contained.scm      \
   build-aux/download.scm                               \
   build-aux/make-binary-tarball.scm                    \
+  build-aux/generate-authors.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                                        \
+  tests/cve-sample.xml                                 \
   build-aux/config.rpath                               \
   bootstrap                                            \
   release.nix                                          \
@@ -288,6 +329,13 @@ EXTRA_DIST +=                                      \
 
 endif !BUILD_DAEMON_OFFLOAD
 
+if !BUILD_SYSCALLS_MODULE
+
+EXTRA_DIST +=                                  \
+  guix/build/syscalls.scm
+
+endif !BUILD_SYSCALLS_MODULE
+
 
 CLEANFILES =                                   \
   $(GOBJECTS)                                  \
@@ -297,6 +345,10 @@ AM_V_GUILEC = $(AM_V_GUILEC_$(V))
 AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
 AM_V_GUILEC_0 = @echo "  GUILEC" $@;
 
+# Flags passed to 'guild compile'.
+GUILD_COMPILE_FLAGS =                          \
+  -Wformat -Wunbound-variable -Warity-mismatch
+
 # Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling.  Otherwise, if
 # $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
 # there that are newer than the local .scm files (for instance because the
@@ -312,8 +364,7 @@ AM_V_GUILEC_0 = @echo "  GUILEC" $@;
        LC_ALL=C                                                        \
        $(top_builddir)/pre-inst-env                                    \
        $(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)"        \
-         -Wformat -Wunbound-variable -Warity-mismatch                  \
-         --target="$(host)"                                            \
+         $(GUILD_COMPILE_FLAGS) --target="$(host)"                     \
          -o "$@" "$<"
 
 SUFFIXES = .go
@@ -362,7 +413,9 @@ guix-binary.%.tar.xz:
          "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@"
 
 
-dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
+dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS
+dist-hook: assert-no-store-file-names
+
 distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
 
 sync-descriptions:
@@ -377,6 +430,14 @@ gen-ChangeLog:
          mv $(distdir)/cl-t $(distdir)/ChangeLog;      \
        fi
 
+gen-AUTHORS:
+       if test -d .git; then                                   \
+         rm -f "$(distdir)/AUTHORS";                           \
+         $(top_builddir)/pre-inst-env "$(GUILE)"               \
+           "$(top_srcdir)/build-aux/generate-authors.scm"      \
+           "$(top_srcdir)" "$(distdir)/AUTHORS";               \
+       fi
+
 # 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                            \
@@ -396,6 +457,6 @@ assert-final-inputs-self-contained:
        $(top_builddir)/pre-inst-env "$(GUILE)"                         \
          "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"
 
-.PHONY: sync-descriptions gen-ChangeLog clean-go
+.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
jackhill's copy of GNU Guix: https://guix.gnu.org/