From e3ce5d709f3ba6a3f3a94a24c20a9cd87e6bd07d Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 28 Jun 2012 01:24:34 +0200
Subject: Add a declarative packaging layer.

* Makefile.am (MODULES): Add `guix/packages.scm' and `distro/base.scm'.
  (TESTS): Add `tests/packages.scm'.
  (EXTRA_DIST): New variable.

* guix/packages.scm, distro/base.scm, tests/packages.scm: New files.

* guix/http.scm (http-fetch): Make `name' an optional argument, to match
  the expectations of `package-source-derivation'.
---
 Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index b2b6d943a..8b5713b1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,9 @@ MODULES =					\
   guix/build/gnu-build-system.scm		\
   guix/build/http.scm				\
   guix/build/utils.scm				\
-  guix.scm
+  guix/packages.scm				\
+  guix.scm					\
+  distro/base.scm
 
 GOBJECTS = $(MODULES:%.scm=%.go)
 
@@ -36,13 +38,15 @@ nobase_nodist_guilemodule_DATA = $(GOBJECTS)
 TESTS =						\
   tests/builders.scm				\
   tests/derivations.scm				\
-  tests/utils.scm
+  tests/utils.scm				\
+  tests/packages.scm
 
 TESTS_ENVIRONMENT =							\
   NIXPKGS="$(NIXPKGS)"							\
   GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"	\
   $(GUILE) -L "$(top_srcdir)"
 
+EXTRA_DIST = $(TESTS)
 CLEANFILES = $(GOBJECTS) *.log
 
 .scm.go:
-- 
cgit v1.3