diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-22 23:23:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:33:50 +0200 |
| commit | a7a4e6a4f719da8d0b26d9a60ff8ed42691d263f (patch) | |
| tree | 8e403c97847edcadcc4da900d7e1c48e675df4bf /daemon.am | |
| parent | 996ed6acd5586f9db08a9388442acdd044285fe4 (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.am | 16 |
1 files changed, 16 insertions, 0 deletions
| @@ -121,6 +121,7 @@ libstore_a_CXXFLAGS = \ | |||
| 121 | $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) | 121 | $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) |
| 122 | 122 | ||
| 123 | bin_PROGRAMS = guix-daemon | 123 | bin_PROGRAMS = guix-daemon |
| 124 | sbin_PROGRAMS = guix-register | ||
| 124 | 125 | ||
| 125 | guix_daemon_SOURCES = \ | 126 | guix_daemon_SOURCES = \ |
| 126 | nix/nix-daemon/nix-daemon.cc \ | 127 | nix/nix-daemon/nix-daemon.cc \ |
| @@ -137,6 +138,21 @@ guix_daemon_LDADD = \ | |||
| 137 | guix_daemon_headers = \ | 138 | guix_daemon_headers = \ |
| 138 | nix/nix-daemon/shared.hh | 139 | nix/nix-daemon/shared.hh |
| 139 | 140 | ||
| 141 | |||
| 142 | guix_register_SOURCES = \ | ||
| 143 | nix/guix-register/guix-register.cc | ||
| 144 | |||
| 145 | guix_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? | ||
| 151 | guix_register_LDADD = \ | ||
| 152 | libstore.a libutil.a libformat.a -lbz2 \ | ||
| 153 | $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) | ||
| 154 | |||
| 155 | |||
| 140 | libexec_PROGRAMS = nix-setuid-helper | 156 | libexec_PROGRAMS = nix-setuid-helper |
| 141 | nix_setuid_helper_SOURCES = \ | 157 | nix_setuid_helper_SOURCES = \ |
| 142 | nix/nix-setuid-helper/nix-setuid-helper.cc | 158 | nix/nix-setuid-helper/nix-setuid-helper.cc |
