diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
| commit | e759c0a38c799f2d03b3454e9ca6acf2262dc957 (patch) | |
| tree | 08f5a1414410bc6719205090ac07484b308ba918 /Makefile.am | |
| parent | 11459384968f654c42ad7dba4443dada35191f5b (diff) | |
| parent | 4a4cbd0bdd2ad8c4f37c3ffdd69596ef1ef41d91 (diff) | |
| download | guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index fff5958355..1f2c4db80d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,17 +62,14 @@ MODULES = \ guix/build/git.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/store-copy.scm \ guix/build/utils.scm \ guix/build/union.scm \ guix/build/pull.scm \ guix/build/rpath.scm \ guix/build/svn.scm \ - guix/build/vm.scm \ - guix/build/install.scm \ - guix/build/activation.scm \ guix/build/syscalls.scm \ guix/build/emacs-utils.scm \ guix/packages.scm \ @@ -89,6 +86,7 @@ MODULES = \ guix/scripts/authenticate.scm \ guix/scripts/refresh.scm \ guix/scripts/system.scm \ + guix/scripts/lint.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) @@ -159,7 +157,8 @@ SCM_TESTS = \ tests/nar.scm \ tests/union.scm \ tests/profiles.scm \ - tests/syscalls.scm + tests/syscalls.scm \ + tests/lint.scm SH_TESTS = \ tests/guix-build.sh \ @@ -279,6 +278,10 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-nix-prefix="$(NIX_PREFIX)" \ --enable-daemon +dist_emacsui_DATA = emacs/guix-main.scm +nodist_emacsui_DATA = emacs/guix-helper.scm +include emacs.am + dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names distcheck-hook: assert-binaries-available assert-final-inputs-self-contained |