X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/233e76769ae3a438bff7117c68f2c88739a28db0..668c06acfc29f1063559c37ef184f436a7b7a8e8:/daemon.am

diff --git a/daemon.am b/daemon.am
index b1265b370a..1059e444ab 100644
--- 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, 2014 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -25,6 +25,8 @@ CLEANFILES += $(BUILT_SOURCES)
 
 noinst_LIBRARIES = libformat.a libutil.a libstore.a
 
+AM_CXXFLAGS = -Wall
+
 libformat_a_SOURCES =				\
   nix/boost/format/free_funcs.cc		\
   nix/boost/format/parsing.cc			\
@@ -54,15 +56,15 @@ libformat_a_CPPFLAGS =				\
 
 libutil_a_SOURCES =				\
   nix/libutil/archive.cc			\
+  nix/libutil/affinity.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/affinity.hh			\
   nix/libutil/hash.hh				\
   nix/libutil/serialise.hh			\
   nix/libutil/xml-writer.hh			\
@@ -107,19 +109,21 @@ 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\"	\
   -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\"	\
-  -DNIX_CONF_DIR=\"$(sysconfdir)/nix\"		\
+  -DNIX_CONF_DIR=\"$(sysconfdir)/guix\"		\
   -DNIX_LIBEXEC_DIR=\"$(libexecdir)\"		\
   -DNIX_BIN_DIR=\"$(bindir)\"			\
-  -DOPENSSL_PATH="\"openssl\""
+  -DOPENSSL_PATH="\"guix-authenticate\""
 
-libstore_a_CFLAGS =				\
+libstore_a_CXXFLAGS =				\
   $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 bin_PROGRAMS = guix-daemon
+sbin_PROGRAMS = guix-register
 
 guix_daemon_SOURCES =				\
   nix/nix-daemon/nix-daemon.cc			\
@@ -136,15 +140,20 @@ guix_daemon_LDADD =				\
 guix_daemon_headers =				\
   nix/nix-daemon/shared.hh
 
-libexec_PROGRAMS = nix-setuid-helper
-nix_setuid_helper_SOURCES =			\
-  nix/nix-setuid-helper/nix-setuid-helper.cc
 
-nix_setuid_helper_CPPFLAGS =			\
-  $(libutil_a_CPPFLAGS)
+guix_register_SOURCES =				\
+  nix/guix-register/guix-register.cc
+
+guix_register_CPPFLAGS =			\
+  $(libutil_a_CPPFLAGS)				\
+  $(libstore_a_CPPFLAGS)			\
+  -I$(top_srcdir)/nix/libstore
+
+# XXX: Should we start using shared libs?
+guix_register_LDADD =				\
+  libstore.a libutil.a libformat.a -lbz2	\
+  $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
 
-nix_setuid_helper_LDADD =			\
-  libutil.a libformat.a
 
 noinst_HEADERS =						\
   $(libformat_headers) $(libutil_headers) $(libstore_headers)	\
@@ -160,7 +169,20 @@ 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
+
+if BUILD_DAEMON_OFFLOAD
+
+nodist_pkglibexec_SCRIPTS +=			\
+  nix/scripts/offload
+
+endif BUILD_DAEMON_OFFLOAD
+
+
+# XXX: It'd be better to hide it in $(pkglibexecdir).
+nodist_libexec_SCRIPTS =			\
+  nix/scripts/guix-authenticate
 
 EXTRA_DIST +=					\
   nix/sync-with-upstream			\