gnu: module-init-tools: Fix $LINUX_MODULE_DIRECTORY handling in 'depmod'.

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

diff --git a/daemon.am b/daemon.am
index 1059e44..b0a6d48 100644 (file)
--- a/daemon.am
+++ b/daemon.am
@@ -25,7 +25,8 @@ CLEANFILES += $(BUILT_SOURCES)
 
 noinst_LIBRARIES = libformat.a libutil.a libstore.a
 
-AM_CXXFLAGS = -Wall
+# Use '-std=c++0x' for 'std::shared_ptr'.
+AM_CXXFLAGS = -Wall -std=c++0x
 
 libformat_a_SOURCES =                          \
   nix/boost/format/free_funcs.cc               \
@@ -33,10 +34,7 @@ libformat_a_SOURCES =                                \
   nix/boost/format/format_implementation.cc
 
 libformat_headers =                            \
-  nix/boost/weak_ptr.hpp                       \
   nix/boost/throw_exception.hpp                        \
-  nix/boost/checked_delete.hpp                 \
-  nix/boost/shared_ptr.hpp                     \
   nix/boost/format.hpp                         \
   nix/boost/assert.hpp                         \
   nix/boost/format/macros_default.hpp          \
@@ -46,10 +44,7 @@ libformat_headers =                          \
   nix/boost/format/group.hpp                   \
   nix/boost/format/feed_args.hpp               \
   nix/boost/format/internals_fwd.hpp           \
-  nix/boost/format/internals.hpp               \
-  nix/boost/detail/workaround.hpp              \
-  nix/boost/detail/shared_count.hpp            \
-  nix/boost/enable_shared_from_this.hpp
+  nix/boost/format/internals.hpp
 
 libformat_a_CPPFLAGS =                         \
   -I$(top_srcdir)/nix
@@ -112,14 +107,14 @@ libstore_a_CPPFLAGS =                             \
   -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_STATE_DIR=\"$(localstatedir)/guix\"    \
+  -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\"  \
   -DNIX_CONF_DIR=\"$(sysconfdir)/guix\"                \
   -DNIX_LIBEXEC_DIR=\"$(libexecdir)\"          \
   -DNIX_BIN_DIR=\"$(bindir)\"                  \
   -DOPENSSL_PATH="\"guix-authenticate\""
 
-libstore_a_CXXFLAGS =                          \
+libstore_a_CXXFLAGS = $(AM_CXXFLAGS)           \
   $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 bin_PROGRAMS = guix-daemon