gnupg: Turn the GPG command name and keyserver into parameters.

[jackhill/guix/guix.git] / daemon.am

diff --git a/daemon.am b/daemon.am
index b1265b3..069700b 100644 (file)
--- a/daemon.am
+++ b/daemon.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -55,14 +55,12 @@ libformat_a_CPPFLAGS =                              \
 libutil_a_SOURCES =                            \
   nix/libutil/archive.cc                       \
   nix/libutil/serialise.cc                     \
-  nix/libutil/immutable.cc                     \
   nix/libutil/util.cc                          \
   nix/libutil/xml-writer.cc                    \
   nix/libutil/hash.cc                          \
   nix/libutil/gcrypt-hash.cc
 
 libutil_headers =                              \
-  nix/libutil/immutable.hh                     \
   nix/libutil/hash.hh                          \
   nix/libutil/serialise.hh                     \
   nix/libutil/xml-writer.hh                    \
@@ -107,6 +105,7 @@ libstore_headers =                          \
 libstore_a_CPPFLAGS =                          \
   $(libutil_a_CPPFLAGS)                                \
   -I$(top_srcdir)/nix/libstore                 \
+  -I$(top_builddir)/nix/libstore               \
   -DNIX_STORE_DIR=\"$(storedir)\"              \
   -DNIX_DATA_DIR=\"$(datadir)\"                        \
   -DNIX_STATE_DIR=\"$(localstatedir)/nix\"     \
@@ -116,7 +115,7 @@ libstore_a_CPPFLAGS =                               \
   -DNIX_BIN_DIR=\"$(bindir)\"                  \
   -DOPENSSL_PATH="\"openssl\""
 
-libstore_a_CFLAGS =                            \
+libstore_a_CXXFLAGS =                          \
   $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 bin_PROGRAMS = guix-daemon
@@ -160,7 +159,8 @@ nix/libstore/schema.sql.hh: nix/libstore/schema.sql
                   (write (get-string-all in) out)))))"
 
 nodist_pkglibexec_SCRIPTS =                    \
-  nix/scripts/list-runtime-roots
+  nix/scripts/list-runtime-roots               \
+  nix/scripts/substitute-binary
 
 EXTRA_DIST +=                                  \
   nix/sync-with-upstream                       \