util: don't specifically check for the /dev/null major/minor, just check whether...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a79e94e893eeb00dcb7ce9c0aca0b315df650994..c4d4d2773dc1157998b8fa0745e28b3836a9e8d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,7 +107,8 @@ rootlibexec_PROGRAMS = \
        systemd-reply-password \
        systemd-readahead-collect \
        systemd-readahead-replay \
-       systemd-tmpfiles
+       systemd-tmpfiles \
+       systemd-user-sessions
 
 noinst_PROGRAMS = \
        test-engine \
@@ -227,6 +228,7 @@ nodist_systemunit_DATA = \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service \
        units/systemd-tmpfiles.service \
+       units/systemd-user-sessions.service \
        units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -258,6 +260,7 @@ EXTRA_DIST = \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in \
        units/systemd-tmpfiles.service.in \
+       units/systemd-user-sessions.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
@@ -371,6 +374,7 @@ libsystemd_core_la_SOURCES = \
        src/path.c \
        src/load-dropin.c \
        src/execute.c \
+       src/utmp-wtmp.c \
        src/exit-status.c \
        src/dbus.c \
        src/dbus-manager.c \
@@ -437,7 +441,6 @@ EXTRA_DIST += \
        src/dbus-common.h \
        src/bus-errors.h \
        src/cgroup-show.h \
-       src/utmp-wtmp.h \
        src/build.h \
        src/shutdownd.h \
        src/readahead-common.h
@@ -645,6 +648,7 @@ systemd_shutdownd_LDADD = \
 
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
+       src/umount.h \
        src/umount.c \
        src/shutdown.c
 
@@ -671,6 +675,16 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_CFLAGS = \
        $(AM_CFLAGS)
 
+systemd_user_sessions_LDADD = \
+       libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+       src/user-sessions.c \
+       src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
@@ -1061,8 +1075,9 @@ install-data-hook:
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target && \
-               $(LN_S) ../getty.target getty.target )
+               rm -f getty.target systemd-user-sessions.service && \
+               $(LN_S) ../getty.target getty.target && \
+               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \