summaryrefslogtreecommitdiff
path: root/daemon.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-09-22 23:23:38 +0200
committerLudovic Courtès <ludo@gnu.org>2013-09-23 00:33:50 +0200
commita7a4e6a4f719da8d0b26d9a60ff8ed42691d263f (patch)
tree8e403c97847edcadcc4da900d7e1c48e675df4bf /daemon.am
parent996ed6acd5586f9db08a9388442acdd044285fe4 (diff)
Add 'guix-register'.
* nix/guix-register/guix-register.cc, tests/guix-register.sh: New files. * Makefile.am (SH_TESTS)[BUILD_DAEMON]: Add tests/guix-register.sh. * daemon.am (sbin_PROGRAMS, guix_register_SOURCES, guix_register_CPPFLAGS, guix_register_LDADD): New variables. * test-env.in: Export 'storedir', 'prefix', 'datarootdir', 'datadir', and 'localstatedir'.
Diffstat (limited to 'daemon.am')
-rw-r--r--daemon.am16
1 files changed, 16 insertions, 0 deletions
diff --git a/daemon.am b/daemon.am
index 8c21dbc3280..77bfe719870 100644
--- a/daemon.am
+++ b/daemon.am
@@ -121,6 +121,7 @@ libstore_a_CXXFLAGS = \
121 $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) 121 $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
122 122
123bin_PROGRAMS = guix-daemon 123bin_PROGRAMS = guix-daemon
124sbin_PROGRAMS = guix-register
124 125
125guix_daemon_SOURCES = \ 126guix_daemon_SOURCES = \
126 nix/nix-daemon/nix-daemon.cc \ 127 nix/nix-daemon/nix-daemon.cc \
@@ -137,6 +138,21 @@ guix_daemon_LDADD = \
137guix_daemon_headers = \ 138guix_daemon_headers = \
138 nix/nix-daemon/shared.hh 139 nix/nix-daemon/shared.hh
139 140
141
142guix_register_SOURCES = \
143 nix/guix-register/guix-register.cc
144
145guix_register_CPPFLAGS = \
146 $(libutil_a_CPPFLAGS) \
147 $(libstore_a_CPPFLAGS) \
148 -I$(top_srcdir)/nix/libstore
149
150# XXX: Should we start using shared libs?
151guix_register_LDADD = \
152 libstore.a libutil.a libformat.a -lbz2 \
153 $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
154
155
140libexec_PROGRAMS = nix-setuid-helper 156libexec_PROGRAMS = nix-setuid-helper
141nix_setuid_helper_SOURCES = \ 157nix_setuid_helper_SOURCES = \
142 nix/nix-setuid-helper/nix-setuid-helper.cc 158 nix/nix-setuid-helper/nix-setuid-helper.cc