summary refs log tree commit diff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-01-11 09:38:49 -0500
committerMark H Weaver <mhw@netris.org>2015-01-11 09:38:49 -0500
commit77448857311318fc9cd866afcb85ca98fccdb25b (patch)
treeefed3a71d1f7b2c2cc292e7e4ba1884c4d26a9e4 /Makefile.am
parent62c155c0bcbc0d71b1bc35e966193b6e8de03246 (diff)
parent0009ed71ad288358cbc7828954b5e1a3f18fd525 (diff)
downloadguix-77448857311318fc9cd866afcb85ca98fccdb25b.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index bc0b95232e..5ee743470b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,10 +174,15 @@ SCM_TESTS =					\
 if HAVE_GUILE_JSON
 
 MODULES +=					\
+  guix/import/json.scm				\
   guix/import/pypi.scm				\
-  guix/scripts/import/pypi.scm
+  guix/scripts/import/pypi.scm			\
+  guix/import/cpan.scm				\
+  guix/scripts/import/cpan.scm
 
-SCM_TESTS += tests/pypi.scm
+SCM_TESTS += 					\
+  tests/pypi.scm				\
+  tests/cpan.scm
 
 endif