gnu: Add deprecation notice for 'sqlite-with-column-metadata'.

[jackhill/guix/guix.git] / nix / local.mk

diff --git a/nix/local.mk b/nix/local.mk
index 3971771..dc5a839 100644 (file)
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 #
 # This file is part of GNU Guix.
@@ -107,20 +107,16 @@ libstore_a_CPPFLAGS =                             \
   -I$(top_srcdir)/%D%/libstore                 \
   -I$(top_builddir)/%D%/libstore               \
   -DNIX_STORE_DIR=\"$(storedir)\"              \
-  -DNIX_DATA_DIR=\"$(datadir)\"                        \
   -DNIX_STATE_DIR=\"$(localstatedir)/guix\"    \
   -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\"  \
   -DGUIX_CONFIGURATION_DIRECTORY=\"$(sysconfdir)/guix\"                \
-  -DNIX_LIBEXEC_DIR=\"$(libexecdir)\"          \
   -DNIX_BIN_DIR=\"$(bindir)\"                  \
-  -DOPENSSL_PATH="\"guix-authenticate\""       \
   -DDEFAULT_CHROOT_DIRS="\"\""
 
 libstore_a_CXXFLAGS = $(AM_CXXFLAGS)           \
   $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 bin_PROGRAMS = guix-daemon
-sbin_PROGRAMS = guix-register
 
 guix_daemon_SOURCES =                          \
   %D%/nix-daemon/nix-daemon.cc                 \
@@ -138,24 +134,9 @@ guix_daemon_LDADD =                                \
 guix_daemon_headers =                          \
   %D%/nix-daemon/shared.hh
 
-
-guix_register_SOURCES =                                \
-  %D%/guix-register/guix-register.cc
-
-guix_register_CPPFLAGS =                       \
-  $(libutil_a_CPPFLAGS)                                \
-  $(libstore_a_CPPFLAGS)                       \
-  -I$(top_srcdir)/%D%/libstore
-
-# XXX: Should we start using shared libs?
-guix_register_LDADD =                          \
-  libstore.a libutil.a libformat.a -lz         \
-  $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
-
 if HAVE_LIBBZ2
 
 guix_daemon_LDADD += -lbz2
-guix_register_LDADD += -lbz2
 
 endif HAVE_LIBBZ2
 
@@ -163,7 +144,7 @@ noinst_HEADERS =                                            \
   $(libformat_headers) $(libutil_headers) $(libstore_headers)  \
   $(guix_daemon_headers)
 
-%D%/libstore/schema.sql.hh: %D%/libstore/schema.sql
+%D%/libstore/schema.sql.hh: guix/store/schema.sql
        $(AM_V_GEN)$(GUILE) --no-auto-compile -c                \
          "(use-modules (rnrs io ports))                        \
           (call-with-output-file \"$@\"                        \
@@ -172,23 +153,6 @@ noinst_HEADERS =                                           \
                 (lambda (in)                                   \
                   (write (get-string-all in) out)))))"
 
-nodist_pkglibexec_SCRIPTS =                    \
-  %D%/scripts/list-runtime-roots               \
-  %D%/scripts/substitute                       \
-  %D%/scripts/download
-
-if BUILD_DAEMON_OFFLOAD
-
-nodist_pkglibexec_SCRIPTS +=                   \
-  %D%/scripts/offload
-
-endif BUILD_DAEMON_OFFLOAD
-
-
-# XXX: It'd be better to hide it in $(pkglibexecdir).
-nodist_libexec_SCRIPTS =                       \
-  %D%/scripts/guix-authenticate
-
 # The '.service' files for systemd.
 systemdservicedir = $(libdir)/systemd/system
 nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service
@@ -216,7 +180,6 @@ CLEANFILES +=                                       \
   $(nodist_upstartjob_DATA)
 
 EXTRA_DIST +=                                  \
-  %D%/libstore/schema.sql                      \
   %D%/AUTHORS                                  \
   %D%/COPYING                                  \
   etc/guix-daemon.service.in                   \