diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
| commit | a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15 (patch) | |
| tree | ba2c4880e3f4ce6509ff219d0fd646493d085e1d /Makefile.am | |
| parent | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (diff) | |
| parent | 20095cc5139666fe67b3ae76b3f46ff85e4956bb (diff) | |
| download | guix-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar.gz guix-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.zip | |
Merge branch 'master' into security-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f67de43f48..8a5430794a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ MODULES = \ guix/graph.scm \ guix/cve.scm \ guix/build-system.scm \ + guix/build-system/ant.scm \ guix/build-system/cmake.scm \ guix/build-system/emacs.scm \ guix/build-system/glib-or-gtk.scm \ @@ -75,6 +76,7 @@ MODULES = \ guix/cvs-download.scm \ guix/svn-download.scm \ guix/ui.scm \ + guix/build/ant-build-system.scm \ guix/build/download.scm \ guix/build/cmake-build-system.scm \ guix/build/emacs-build-system.scm \ @@ -171,8 +173,10 @@ dist_noinst_DATA = guix/tests.scm # Linux-Libre configurations. KCONFIGS = \ - gnu/packages/linux-libre-i686.conf \ - gnu/packages/linux-libre-x86_64.conf \ + gnu/packages/linux-libre-4.5-i686.conf \ + gnu/packages/linux-libre-4.5-x86_64.conf \ + gnu/packages/linux-libre-4.4-i686.conf \ + gnu/packages/linux-libre-4.4-x86_64.conf \ gnu/packages/linux-libre-4.1-i686.conf \ gnu/packages/linux-libre-4.1-x86_64.conf |