tmpfiles: Move /tmp and /var/tmp to a separate tmpfiles.d file to ease overrides...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7971b6b774cf8604d61a7d5014cafb1752a3d67f..c1a4a5f1b01a088af4e286b69497d2d75766a6ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -172,7 +172,6 @@ rootlibexec_PROGRAMS = \
        systemd-detect-virt \
        systemd-sysctl \
         systemd-localed \
-        systemd-timedated \
         systemd-logind \
         systemd-uaccess
 
@@ -186,6 +185,11 @@ rootlibexec_PROGRAMS += \
        systemd-hostnamed
 endif
 
+if ENABLE_TIMEDATED
+rootlibexec_PROGRAMS += \
+       systemd-timedated
+endif
+
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
@@ -231,7 +235,6 @@ dist_pkgsysconf_DATA = \
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf \
         src/org.freedesktop.locale1.conf \
-        src/org.freedesktop.timedate1.conf \
         src/org.freedesktop.login1.conf
 
 if ENABLE_HOSTNAMED
@@ -239,10 +242,14 @@ dist_dbuspolicy_DATA += \
        src/org.freedesktop.hostname1.conf
 endif
 
+if ENABLE_TIMEDATED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.timedate1.conf
+endif
+
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
         src/org.freedesktop.locale1.service \
-        src/org.freedesktop.timedate1.service \
         src/org.freedesktop.login1.service
 
 if ENABLE_HOSTNAMED
@@ -250,6 +257,11 @@ dist_dbussystemservice_DATA += \
        src/org.freedesktop.hostname1.service
 endif
 
+if ENABLE_TIMEDATED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.timedate1.service
+endif
+
 dist_udevrules_DATA = \
         src/70-uaccess.rules \
         src/71-seat.rules
@@ -272,19 +284,24 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Snapshot.xml \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml \
-        org.freedesktop.locale1.xml \
-        org.freedesktop.timedate1.xml
+        org.freedesktop.locale1.xml
 
 if ENABLE_HOSTNAMED
 dbusinterface_DATA += \
        org.freedesktop.hostname1.xml
 endif
 
+if ENABLE_TIMEDATED
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
+endif
+
 dist_bashcompletion_DATA = \
        src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
+       tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf
 
 if HAVE_SYSV_COMPAT
@@ -365,7 +382,6 @@ nodist_systemunit_DATA = \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
        units/systemd-localed.service \
-       units/systemd-timedated.service \
        units/systemd-logind.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
@@ -404,6 +420,11 @@ nodist_systemunit_DATA += \
        units/systemd-hostnamed.service
 endif
 
+if ENABLE_TIMEDATED
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
+endif
+
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -420,7 +441,6 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-localed.service.in \
-       units/systemd-timedated.service.in \
        units/systemd-logind.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
@@ -467,6 +487,11 @@ EXTRA_DIST += \
        units/systemd-hostnamed.service.in
 endif
 
+if ENABLE_TIMEDATED
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
@@ -530,7 +555,6 @@ pkgconfiglib_DATA = \
 # Passed through intltool only
 polkitpolicy_in_files = \
         src/org.freedesktop.locale1.policy.in \
-        src/org.freedesktop.timedate1.policy.in \
         src/org.freedesktop.login1.policy.in
 
 if ENABLE_HOSTNAMED
@@ -538,6 +562,11 @@ polkitpolicy_in_files += \
        src/org.freedesktop.hostname1.policy.in
 endif
 
+if ENABLE_TIMEDATED
+polkitpolicy_in_files += \
+       src/org.freedesktop.timedate1.policy.in
+endif
+
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
        src/org.freedesktop.systemd1.policy.in.in
@@ -627,7 +656,8 @@ libsystemd_core_la_SOURCES = \
        src/condition.c \
         src/dbus-common.c \
         src/sd-daemon.c \
-        src/install.c
+        src/install.c \
+        src/cgroup-attr.c
 
 nodist_libsystemd_core_la_SOURCES = \
         src/load-fragment-gperf.c \
@@ -1341,7 +1371,8 @@ systemd_cgls_LDADD = \
 
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+        src/loopback-setup.c
 
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS)
@@ -1760,11 +1791,10 @@ endif
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.locale1.service dbus-org.freedesktop.login1.service autovt@.service && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target && \
                 $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
-                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service && \
                 $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
                 $(LN_S) getty@.service autovt@.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
@@ -1815,6 +1845,11 @@ if ENABLE_HOSTNAMED
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.hostname1.service && \
                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+endif
+if ENABLE_TIMEDATED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
 endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \