chiark / gitweb /
libsystemd-daemon: restructure Makefile.am
authorKay Sievers <kay.sievers@vrfy.org>
Sat, 31 Dec 2011 08:17:48 +0000 (09:17 +0100)
committerKay Sievers <kay.sievers@vrfy.org>
Sat, 31 Dec 2011 08:17:48 +0000 (09:17 +0100)
Makefile.am

index 6f2c871..0054930 100644 (file)
@@ -68,6 +68,7 @@ EXTRA_DIST =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
+pkginclude_HEADERS =
 polkitpolicy_in_files =
 
 AM_CPPFLAGS = \
@@ -209,9 +210,6 @@ endif
 lib_LTLIBRARIES = \
        libsystemd-daemon.la
 
-pkginclude_HEADERS = \
-       src/sd-daemon.h
-
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -610,7 +608,6 @@ libsystemd_core_la_LIBADD = \
 EXTRA_DIST += \
        ${libsystemd_basic_la_SOURCES:.c=.h} \
        ${libsystemd_core_la_SOURCES:.c=.h} \
-       ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
        src/def.h \
        src/ioprio.h \
@@ -907,1030 +904,1043 @@ dist_pkgdata_DATA = \
 dist_noinst_SCRIPT = \
        src/generate-kbd-model-map
 
-# ------------------------------------------------------------------------------
-libsystemd_id128_la_SOURCES = \
-       src/sd-id128.c
+systemd_shutdown_SOURCES = \
+       src/mount-setup.c \
+       src/umount.c \
+       src/shutdown.c
 
-libsystemd_id128_la_CFLAGS = \
+systemd_shutdown_CFLAGS = \
        $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_id128_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
+       $(UDEV_CFLAGS)
 
-libsystemd_id128_la_LIBADD = \
-       libsystemd-basic.la
+systemd_shutdown_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
 
-test_id128_SOURCES = \
-       src/test-id128.c \
-       src/sd-id128.c
+systemd_modules_load_SOURCES = \
+       src/modules-load.c
 
-test_id128_CFLAGS = \
+systemd_modules_load_CFLAGS = \
        $(AM_CFLAGS)
 
-test_id128_LDADD = \
+systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
-noinst_PROGRAMS += \
-       test-id128
+systemd_tmpfiles_SOURCES = \
+       src/tmpfiles.c
 
-pkginclude_HEADERS += \
-       src/sd-id128.h
+systemd_tmpfiles_CFLAGS = \
+       $(AM_CFLAGS)
 
-lib_LTLIBRARIES += \
-       libsystemd-id128.la
+systemd_tmpfiles_LDADD = \
+       libsystemd-basic.la
 
-pkgconfiglib_DATA += \
-       libsystemd-id128.pc
+systemd_machine_id_setup_SOURCES = \
+       src/machine-id-setup.c \
+       src/machine-id-main.c \
+       src/sd-id128.c
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-id128-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
-       fi
+systemd_machine_id_setup_CFLAGS = \
+       $(AM_CFLAGS)
 
-INSTALL_EXEC_HOOKS += \
-       libsystemd-id128-install-hook
+systemd_machine_id_setup_LDADD = \
+       libsystemd-basic.la
 
-libsystemd-id128-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+systemd_sysctl_SOURCES = \
+       src/sysctl.c
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-id128-uninstall-hook
+systemd_sysctl_CFLAGS = \
+       $(AM_CFLAGS)
 
-EXTRA_DIST += \
-       libsystemd-id128.pc.in \
-       src/libsystemd-id128.sym
+systemd_sysctl_LDADD = \
+       libsystemd-basic.la
 
-# ------------------------------------------------------------------------------
-systemd_journald_SOURCES = \
-       src/journal/journald.c \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/journal/journal-rate-limit.c \
-       src/sd-id128.c \
-       src/acl-util.c \
-       src/cgroup-util.c
+systemd_fsck_SOURCES = \
+       src/fsck.c \
+       src/dbus-common.c
 
-systemd_journald_CFLAGS = \
+systemd_fsck_CFLAGS = \
        $(AM_CFLAGS) \
-       $(ACL_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(DBUS_CFLAGS)
 
-systemd_journald_LDADD = \
+systemd_fsck_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(ACL_LIBS)
-
-if HAVE_XZ
-systemd_journald_SOURCES += \
-       src/journal/compress.c
-systemd_journald_CFLAGS += \
-       $(XZ_CFLAGS)
-systemd_journald_LDADD += \
-       $(XZ_LIBS)
-endif
+       $(UDEV_LIBS) \
+       $(DBUS_LIBS)
 
-systemd_journalctl_SOURCES = \
-       src/journal/journalctl.c \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/sd-id128.c \
-       src/pager.c
+systemd_quotacheck_SOURCES = \
+       src/quotacheck.c
 
-systemd_journalctl_CFLAGS = \
+systemd_quotacheck_CFLAGS = \
        $(AM_CFLAGS)
 
-systemd_journalctl_LDADD = \
+systemd_quotacheck_LDADD = \
        libsystemd-basic.la
 
-if HAVE_XZ
-systemd_journalctl_SOURCES += \
-       src/journal/compress.c
-systemd_journalctl_CFLAGS += \
-       $(XZ_CFLAGS)
-systemd_journalctl_LDADD += \
-       $(XZ_LIBS)
-endif
+systemd_timestamp_SOURCES = \
+       src/timestamp.c
 
-test_journal_SOURCES = \
-       src/journal/test-journal.c \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/journal/journal-send.c \
-       src/sd-id128.c
+systemd_timestamp_CFLAGS = \
+       $(AM_CFLAGS)
 
-test_journal_LDADD = \
+systemd_timestamp_LDADD = \
        libsystemd-basic.la
 
-if HAVE_XZ
-test_journal_SOURCES += \
-       src/journal/compress.c
+systemd_ac_power_SOURCES = \
+       src/ac-power.c
 
-test_journal_CFLAGS = \
-       $(XZ_CFLAGS)
+systemd_ac_power_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
 
-test_journal_LDADD += \
-       $(XZ_LIBS)
-endif
+systemd_ac_power_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
 
-libsystemd_journal_la_SOURCES = \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/compress.c \
-       src/journal/lookup3.c \
-       src/journal/journal-send.c
+systemd_detect_virt_SOURCES = \
+       src/detect-virt.c
 
-libsystemd_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS) \
-       -fvisibility=hidden
+systemd_detect_virt_CFLAGS = \
+       $(AM_CFLAGS)
 
-libsystemd_journal_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
+systemd_detect_virt_LDADD = \
+       libsystemd-basic.la
 
-libsystemd_journal_la_LIBADD = \
-       libsystemd-basic.la \
-       libsystemd-id128.la \
-       $(XZ_LIBS)
+systemd_cryptsetup_SOURCES = \
+       src/cryptsetup.c \
+       src/ask-password-api.c
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-journal-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
-       fi
+systemd_cryptsetup_CFLAGS = \
+       $(LIBCRYPTSETUP_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(AM_CFLAGS)
 
-INSTALL_EXEC_HOOKS += \
-       libsystemd-journal-install-hook
+systemd_cryptsetup_LDADD = \
+       $(LIBCRYPTSETUP_LIBS) \
+       $(UDEV_LIBS) \
+       libsystemd-basic.la
 
-libsystemd-journal-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
+systemd_cryptsetup_generator_SOURCES = \
+       src/cryptsetup-generator.c \
+       src/unit-name.c
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-journal-uninstall-hook
+systemd_cryptsetup_generator_CFLAGS = \
+       $(AM_CFLAGS)
 
-noinst_PROGRAMS += \
-       test-journal
+systemd_cryptsetup_generator_LDADD = \
+       libsystemd-basic.la
 
-pkginclude_HEADERS += \
-       src/journal/sd-journal.h
+systemd_getty_generator_SOURCES = \
+       src/getty-generator.c \
+       src/unit-name.c
 
-lib_LTLIBRARIES += \
-       libsystemd-journal.la
+systemd_getty_generator_CFLAGS = \
+       $(AM_CFLAGS)
 
-rootlibexec_PROGRAMS += \
-       systemd-journald
+systemd_getty_generator_LDADD = \
+       libsystemd-basic.la
 
-rootbin_PROGRAMS += \
-       systemd-journalctl
+systemd_rc_local_generator_SOURCES = \
+       src/rc-local-generator.c
 
-dist_systemunit_DATA += \
-       units/systemd-journald.socket
+systemd_rc_local_generator_CFLAGS = \
+       $(AM_CFLAGS)
 
-nodist_systemunit_DATA += \
-       units/systemd-journald.service
+systemd_rc_local_generator_LDADD = \
+       libsystemd-basic.la
 
-pkgconfiglib_DATA += \
-       src/journal/libsystemd-journal.pc
+systemd_user_sessions_SOURCES = \
+       src/user-sessions.c \
+       src/cgroup-util.c
 
-journal-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-journald.socket && \
-               $(LN_S) ../systemd-journald.socket )
+systemd_user_sessions_CFLAGS = \
+       $(AM_CFLAGS)
 
-INSTALL_DATA_HOOKS += \
-       journal-install-data-hook
-
-EXTRA_DIST += \
-       src/journal/journal-def.h \
-       src/journal/journal-internal.h \
-       src/journal/journal-file.h \
-       src/journal/lookup3.h \
-       src/journal/compress.h \
-       src/journal/journal-rate-limit.h \
-       src/journal/libsystemd-journal.pc.in \
-       src/journal/libsystemd-journal.sym \
-       units/systemd-journald.service.in
-
-# ------------------------------------------------------------------------------
-if ENABLE_BINFMT
-systemd_binfmt_SOURCES = \
-       src/binfmt/binfmt.c
-
-systemd_binfmt_LDADD = \
+systemd_user_sessions_LDADD = \
        libsystemd-basic.la
 
-rootlibexec_PROGRAMS += \
-       systemd-binfmt
-
-dist_systemunit_DATA += \
-       units/proc-sys-fs-binfmt_misc.automount \
-       units/proc-sys-fs-binfmt_misc.mount
+systemd_vconsole_setup_SOURCES = \
+       src/vconsole-setup.c
 
-nodist_systemunit_DATA += \
-       units/systemd-binfmt.service
+systemd_vconsole_setup_CFLAGS = \
+       $(AM_CFLAGS)
 
-binfmt-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(prefix)/lib/binfmt.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-binfmt.service \
-                       proc-sys-fs-binfmt_misc.automount && \
-               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
-               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+systemd_vconsole_setup_LDADD = \
+       libsystemd-basic.la
 
-INSTALL_DATA_HOOKS += \
-       binfmt-install-data-hook
+systemd_remount_api_vfs_SOURCES = \
+       src/remount-api-vfs.c \
+       src/mount-setup.c \
+       src/exit-status.c
 
-MANPAGES += \
-       man/binfmt.d.5
+systemd_remount_api_vfs_CFLAGS = \
+       $(AM_CFLAGS)
 
-EXTRA_DIST += \
-       units/systemd-binfmt.service.in
-endif
+systemd_remount_api_vfs_LDADD = \
+       libsystemd-basic.la
 
-# ------------------------------------------------------------------------------
-if ENABLE_HOSTNAMED
-systemd_hostnamed_SOURCES = \
-       src/hostname/hostnamed.c \
-       src/dbus-common.c \
-       src/polkit.c
+systemd_cgroups_agent_SOURCES = \
+       src/cgroups-agent.c \
+       src/dbus-common.c
 
-systemd_hostnamed_CFLAGS = \
+systemd_cgroups_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
-systemd_hostnamed_LDADD = \
+systemd_cgroups_agent_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
-rootlibexec_PROGRAMS += \
-       systemd-hostnamed
-
-nodist_systemunit_DATA += \
-       units/systemd-hostnamed.service
-
-dist_dbuspolicy_DATA += \
-       src/hostname/org.freedesktop.hostname1.conf
-
-dist_dbussystemservice_DATA += \
-       src/hostname/org.freedesktop.hostname1.service
-
-polkitpolicy_in_files += \
-       src/hostname/org.freedesktop.hostname1.policy.in
-
-dbusinterface_DATA += \
-       org.freedesktop.hostname1.xml
-
-org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-hostnamed-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.hostname1.service && \
-               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+systemd_kmsg_syslogd_SOURCES = \
+       src/kmsg-syslogd.c \
+       src/fdset.c
 
-INSTALL_DATA_HOOKS += \
-       hostnamed-install-data-hook
+systemd_kmsg_syslogd_CFLAGS = \
+       $(AM_CFLAGS)
 
-EXTRA_DIST += \
-       units/systemd-hostnamed.service.in
-endif
+systemd_kmsg_syslogd_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
-# ------------------------------------------------------------------------------
-if ENABLE_LOCALED
-systemd_localed_SOURCES = \
-       src/locale/localed.c \
+systemctl_SOURCES = \
+       src/systemctl.c \
+       src/utmp-wtmp.c \
        src/dbus-common.c \
-       src/polkit.c
+       src/path-lookup.c \
+       src/cgroup-show.c \
+       src/cgroup-util.c \
+       src/exit-status.c \
+       src/unit-name.c \
+       src/pager.c \
+       src/install.c \
+       src/spawn-agent.c
 
-systemd_localed_CFLAGS = \
+systemctl_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
-systemd_localed_LDADD = \
+systemctl_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
-nodist_systemunit_DATA += \
-       units/systemd-localed.service
-
-rootlibexec_PROGRAMS += \
-       systemd-localed
+systemd_notify_SOURCES = \
+       src/notify.c \
+       src/sd-readahead.c
 
-dist_dbuspolicy_DATA += \
-       src/locale/org.freedesktop.locale1.conf
+systemd_notify_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
-dist_dbussystemservice_DATA += \
-       src/locale/org.freedesktop.locale1.service
+systemd_ask_password_SOURCES = \
+       src/ask-password.c \
+       src/ask-password-api.c
 
-polkitpolicy_in_files += \
-       src/locale/org.freedesktop.locale1.policy.in
+systemd_ask_password_LDADD = \
+       libsystemd-basic.la
 
-dbusinterface_DATA += \
-       org.freedesktop.locale1.xml
+systemd_reply_password_SOURCES = \
+       src/reply-password.c
 
-org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+systemd_reply_password_LDADD = \
+       libsystemd-basic.la
 
-localed-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.locale1.service && \
-               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
+systemd_readahead_collect_SOURCES = \
+       src/readahead-collect.c \
+       src/readahead-common.c
 
-INSTALL_DATA_HOOKS += \
-       localed-install-data-hook
+systemd_readahead_collect_CFLAGS = \
+       $(UDEV_CFLAGS)
 
-EXTRA_DIST += \
-       units/systemd-localed.service.in
-endif
+systemd_readahead_collect_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(UDEV_LIBS)
 
-# ------------------------------------------------------------------------------
-if ENABLE_TIMEDATED
-systemd_timedated_SOURCES = \
-       src/timedate/timedated.c \
-       src/dbus-common.c \
-       src/polkit.c
+systemd_readahead_replay_SOURCES = \
+       src/readahead-replay.c \
+       src/readahead-common.c
 
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+systemd_readahead_replay_CFLAGS = \
+       $(UDEV_CFLAGS)
 
-systemd_timedated_LDADD = \
+systemd_readahead_replay_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
-       $(DBUS_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-timedated
+       $(UDEV_LIBS)
 
-dist_dbussystemservice_DATA += \
-       src/timedate/org.freedesktop.timedate1.service
+systemd_cgls_SOURCES = \
+       src/cgls.c \
+       src/cgroup-show.c \
+       src/cgroup-util.c \
+       src/pager.c
 
-dist_dbuspolicy_DATA += \
-       src/timedate/org.freedesktop.timedate1.conf
+systemd_cgls_CFLAGS = \
+       $(AM_CFLAGS)
 
-nodist_systemunit_DATA += \
-       units/systemd-timedated.service
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
 
-polkitpolicy_in_files += \
-       src/timedate/org.freedesktop.timedate1.policy.in
+systemd_nspawn_SOURCES = \
+       src/nspawn.c \
+       src/cgroup-util.c \
+       src/loopback-setup.c
 
-org.freedesktop.timedate1.xml: systemd-timedated
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS)
 
-dbusinterface_DATA += \
-       org.freedesktop.timedate1.xml
+systemd_nspawn_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
-timedated-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.timedate1.service  && \
-               $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+systemd_stdio_bridge_SOURCES = \
+       src/bridge.c
 
-INSTALL_DATA_HOOKS += \
-       timedated-install-data-hook
+systemd_stdio_bridge_LDADD = \
+       libsystemd-basic.la
 
-EXTRA_DIST += \
-       units/systemd-timedated.service.in
-endif
+systemadm_SOURCES = \
+       src/systemadm.vala \
+       src/systemd-interfaces.vala \
+       src/wraplabel.vala
 
-# ------------------------------------------------------------------------------
-if ENABLE_LOGIND
-systemd_logind_SOURCES = \
-       src/login/logind.c \
-       src/login/logind-dbus.c \
-       src/login/logind-device.c \
-       src/login/logind-seat.c \
-       src/login/logind-seat-dbus.c \
-       src/login/logind-session.c \
-       src/login/logind-session-dbus.c \
-       src/login/logind-user.c \
-       src/login/logind-user-dbus.c \
-       src/dbus-common.c \
-       src/dbus-loop.c \
-       src/cgroup-util.c \
-       src/polkit.c
+systemadm_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
 
-nodist_systemd_logind_SOURCES = \
-       src/login/logind-gperf.c
+systemadm_VALAFLAGS = \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       --pkg=gee-1.0 \
+       -g
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-       src/login/logind-acl.c \
-       src/acl-util.c
-endif
+systemadm_LDADD = \
+       $(GTK_LIBS)
 
-systemd_logind_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I $(top_srcdir)/src/login
+systemd_gnome_ask_password_agent_SOURCES = \
+       src/gnome-ask-password-agent.vala
 
-systemd_logind_CFLAGS = \
+systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(ACL_CFLAGS)
+       $(LIBNOTIFY_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
 
-systemd_logind_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS) \
-       $(ACL_LIBS)
+systemd_gnome_ask_password_agent_VALAFLAGS = \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       --pkg=linux \
+       --pkg=gio-unix-2.0 \
+       --pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -g
 
-rootlibexec_PROGRAMS += \
-       systemd-logind
+systemd_gnome_ask_password_agent_LDADD = \
+       $(LIBNOTIFY_LIBS) \
+       $(GTK_LIBS)
 
-systemd_loginctl_SOURCES = \
-       src/login/loginctl.c \
-       src/dbus-common.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c \
-       src/sysfs-show.c
+systemd_tty_ask_password_agent_SOURCES = \
+       src/tty-ask-password-agent.c \
+       src/ask-password-api.c \
+       src/utmp-wtmp.c
 
-systemd_loginctl_CFLAGS = \
+systemd_tty_ask_password_agent_LDADD = \
+       libsystemd-basic.la
+
+# ------------------------------------------------------------------------------
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
+libsystemd_daemon_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       -fvisibility=hidden \
+       -DSD_EXPORT_SYMBOLS
 
-systemd_loginctl_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS)
+libsystemd_daemon_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
-rootbin_PROGRAMS += \
-       systemd-loginctl
+pkginclude_HEADERS += \
+       src/sd-daemon.h
 
-test_login_SOURCES = \
-       src/login/test-login.c
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-daemon-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
+       fi
 
-test_login_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-login.la
+INSTALL_EXEC_HOOKS += \
+       libsystemd-daemon-install-hook
 
-noinst_PROGRAMS += \
-       test-login
+libsystemd-daemon-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
-libsystemd_login_la_SOURCES = \
-       src/login/sd-login.c \
-       src/cgroup-util.c
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-daemon-uninstall-hook
 
-libsystemd_login_la_CFLAGS = \
+EXTRA_DIST += \
+       ${libsystemd_daemon_la_SOURCES:.c=.h}
+
+# ------------------------------------------------------------------------------
+libsystemd_id128_la_SOURCES = \
+       src/sd-id128.c
+
+libsystemd_id128_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=hidden
 
-libsystemd_login_la_LDFLAGS = \
+libsystemd_id128_la_LDFLAGS = \
        -shared \
-       -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
+       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
 
-libsystemd_login_la_LIBADD = \
+libsystemd_id128_la_LIBADD = \
        libsystemd-basic.la
 
-if HAVE_PAM
-pam_systemd_la_SOURCES = \
-       src/pam-module.c \
-       src/dbus-common.c
+test_id128_SOURCES = \
+       src/test-id128.c \
+       src/sd-id128.c
 
-pam_systemd_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       -fvisibility=hidden
+test_id128_CFLAGS = \
+       $(AM_CFLAGS)
 
-pam_systemd_la_LDFLAGS = \
-       -module \
-       -export-dynamic \
-       -avoid-version \
-       -shared \
-       -export-symbols-regex '^pam_sm_.*'
+test_id128_LDADD = \
+       libsystemd-basic.la
 
-pam_systemd_la_LIBADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(PAM_LIBS) \
-       $(DBUS_LIBS)
+noinst_PROGRAMS += \
+       test-id128
 
-pamlib_LTLIBRARIES = \
-       pam_systemd.la
-endif
+pkginclude_HEADERS += \
+       src/sd-id128.h
+
+lib_LTLIBRARIES += \
+       libsystemd-id128.la
+
+pkgconfiglib_DATA += \
+       libsystemd-id128.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-login-install-hook:
+libsystemd-id128-install-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
                mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
        fi
 
 INSTALL_EXEC_HOOKS += \
-       libsystemd-login-install-hook
+       libsystemd-id128-install-hook
 
-libsystemd-login-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+libsystemd-id128-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
 
 UNINSTALL_EXEC_HOOKS += \
-       libsystemd-login-uninstall-hook
+       libsystemd-id128-uninstall-hook
 
-nodist_systemunit_DATA += \
-       units/systemd-logind.service
+EXTRA_DIST += \
+       libsystemd-id128.pc.in \
+       src/libsystemd-id128.sym
 
-dist_dbussystemservice_DATA += \
-       src/login/org.freedesktop.login1.service
+# ------------------------------------------------------------------------------
+systemd_journald_SOURCES = \
+       src/journal/journald.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/journal/journal-rate-limit.c \
+       src/sd-id128.c \
+       src/acl-util.c \
+       src/cgroup-util.c
 
-dist_dbuspolicy_DATA += \
-       src/login/org.freedesktop.login1.conf
+systemd_journald_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ACL_CFLAGS)
 
-dist_pkgsysconf_DATA += \
-       src/login/systemd-logind.conf
+systemd_journald_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(ACL_LIBS)
 
-pkginclude_HEADERS += \
-       src/login/sd-login.h
+if HAVE_XZ
+systemd_journald_SOURCES += \
+       src/journal/compress.c
+systemd_journald_CFLAGS += \
+       $(XZ_CFLAGS)
+systemd_journald_LDADD += \
+       $(XZ_LIBS)
+endif
 
-lib_LTLIBRARIES += \
-       libsystemd-login.la
+systemd_journalctl_SOURCES = \
+       src/journal/journalctl.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/sd-id128.c \
+       src/pager.c
 
-pkgconfiglib_DATA += \
-       libsystemd-login.pc
+systemd_journalctl_CFLAGS = \
+       $(AM_CFLAGS)
 
-polkitpolicy_in_files += \
-       src/login/org.freedesktop.login1.policy.in
+systemd_journalctl_LDADD = \
+       libsystemd-basic.la
 
-logind-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.login1.service && \
-               $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f systemd-logind.service && \
-               $(LN_S) ../systemd-logind.service systemd-logind.service )
+if HAVE_XZ
+systemd_journalctl_SOURCES += \
+       src/journal/compress.c
+systemd_journalctl_CFLAGS += \
+       $(XZ_CFLAGS)
+systemd_journalctl_LDADD += \
+       $(XZ_LIBS)
+endif
 
-INSTALL_DATA_HOOKS += \
-       logind-install-data-hook
+test_journal_SOURCES = \
+       src/journal/test-journal.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/journal/journal-send.c \
+       src/sd-id128.c
 
-systemd_uaccess_SOURCES = \
-       src/login/uaccess.c
+test_journal_LDADD = \
+       libsystemd-basic.la
 
-if HAVE_ACL
-systemd_uaccess_SOURCES += \
-       src/login/logind-acl.c \
-       src/acl-util.c
+if HAVE_XZ
+test_journal_SOURCES += \
+       src/journal/compress.c
+
+test_journal_CFLAGS = \
+       $(XZ_CFLAGS)
+
+test_journal_LDADD += \
+       $(XZ_LIBS)
 endif
 
-systemd_uaccess_CFLAGS = \
+libsystemd_journal_la_SOURCES = \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/compress.c \
+       src/journal/lookup3.c \
+       src/journal/journal-send.c
+
+libsystemd_journal_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(ACL_CFLAGS)
+       $(XZ_CFLAGS) \
+       -fvisibility=hidden
 
-systemd_uaccess_LDADD = \
+libsystemd_journal_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-login.la \
-       $(UDEV_LIBS) \
-       $(ACL_LIBS)
+       libsystemd-id128.la \
+       $(XZ_LIBS)
 
-rootlibexec_PROGRAMS += \
-       systemd-uaccess
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-journal-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
+       fi
 
-dist_udevrules_DATA += \
-       src/70-uaccess.rules
+INSTALL_EXEC_HOOKS += \
+       libsystemd-journal-install-hook
 
-MANPAGES += \
-       man/systemd-logind.conf.5 \
-       man/sd-login.7 \
-       man/systemd-loginctl.1 \
-       man/sd_login_monitor_new.3
+libsystemd-journal-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
 
-MANPAGES_ALIAS += \
-       man/sd_login_monitor_unref.3 \
-       man/sd_login_monitor_flush.3 \
-       man/sd_login_monitor_get_fd.3
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-journal-uninstall-hook
 
-man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
+noinst_PROGRAMS += \
+       test-journal
 
-EXTRA_DIST += \
-       src/login/logind-gperf.gperf \
-       units/systemd-logind.service.in \
-       libsystemd-login.pc.in \
-       src/login/libsystemd-login.sym \
-       src/login/logind.h \
-       src/login/logind-device.h \
-       src/login/logind-seat.h \
-       src/login/logind-session.h \
-       src/login/logind-user.h \
-       src/login/logind-acl.h
+pkginclude_HEADERS += \
+       src/journal/sd-journal.h
 
-CLEANFILES += \
-       src/login/logind-gperf.c
-endif
-# ------------------------------------------------------------------------------
+lib_LTLIBRARIES += \
+       libsystemd-journal.la
 
-systemd_shutdown_SOURCES = \
-       src/mount-setup.c \
-       src/umount.c \
-       src/shutdown.c
+rootlibexec_PROGRAMS += \
+       systemd-journald
 
-systemd_shutdown_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
+rootbin_PROGRAMS += \
+       systemd-journalctl
 
-systemd_shutdown_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
+dist_systemunit_DATA += \
+       units/systemd-journald.socket
 
-systemd_modules_load_SOURCES = \
-       src/modules-load.c
+nodist_systemunit_DATA += \
+       units/systemd-journald.service
 
-systemd_modules_load_CFLAGS = \
-       $(AM_CFLAGS)
+pkgconfiglib_DATA += \
+       src/journal/libsystemd-journal.pc
 
-systemd_modules_load_LDADD = \
-       libsystemd-basic.la
+journal-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
+               rm -f systemd-journald.socket && \
+               $(LN_S) ../systemd-journald.socket )
 
-systemd_tmpfiles_SOURCES = \
-       src/tmpfiles.c
+INSTALL_DATA_HOOKS += \
+       journal-install-data-hook
 
-systemd_tmpfiles_CFLAGS = \
-       $(AM_CFLAGS)
+EXTRA_DIST += \
+       src/journal/journal-def.h \
+       src/journal/journal-internal.h \
+       src/journal/journal-file.h \
+       src/journal/lookup3.h \
+       src/journal/compress.h \
+       src/journal/journal-rate-limit.h \
+       src/journal/libsystemd-journal.pc.in \
+       src/journal/libsystemd-journal.sym \
+       units/systemd-journald.service.in
 
-systemd_tmpfiles_LDADD = \
+# ------------------------------------------------------------------------------
+if ENABLE_BINFMT
+systemd_binfmt_SOURCES = \
+       src/binfmt/binfmt.c
+
+systemd_binfmt_LDADD = \
        libsystemd-basic.la
 
-systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup.c \
-       src/machine-id-main.c \
-       src/sd-id128.c
+rootlibexec_PROGRAMS += \
+       systemd-binfmt
 
-systemd_machine_id_setup_CFLAGS = \
-       $(AM_CFLAGS)
+dist_systemunit_DATA += \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount
 
-systemd_machine_id_setup_LDADD = \
-       libsystemd-basic.la
+nodist_systemunit_DATA += \
+       units/systemd-binfmt.service
 
-systemd_sysctl_SOURCES = \
-       src/sysctl.c
+binfmt-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-binfmt.service \
+                       proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
 
-systemd_sysctl_CFLAGS = \
-       $(AM_CFLAGS)
+INSTALL_DATA_HOOKS += \
+       binfmt-install-data-hook
 
-systemd_sysctl_LDADD = \
-       libsystemd-basic.la
+MANPAGES += \
+       man/binfmt.d.5
 
-systemd_fsck_SOURCES = \
-       src/fsck.c \
-       src/dbus-common.c
+EXTRA_DIST += \
+       units/systemd-binfmt.service.in
+endif
 
-systemd_fsck_CFLAGS = \
+# ------------------------------------------------------------------------------
+if ENABLE_HOSTNAMED
+systemd_hostnamed_SOURCES = \
+       src/hostname/hostnamed.c \
+       src/dbus-common.c \
+       src/polkit.c
+
+systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
-       $(UDEV_CFLAGS) \
        $(DBUS_CFLAGS)
 
-systemd_fsck_LDADD = \
+systemd_hostnamed_LDADD = \
        libsystemd-basic.la \
-       $(UDEV_LIBS) \
+       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
-systemd_quotacheck_SOURCES = \
-       src/quotacheck.c
-
-systemd_quotacheck_CFLAGS = \
-       $(AM_CFLAGS)
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
 
-systemd_quotacheck_LDADD = \
-       libsystemd-basic.la
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
 
-systemd_timestamp_SOURCES = \
-       src/timestamp.c
+dist_dbuspolicy_DATA += \
+       src/hostname/org.freedesktop.hostname1.conf
 
-systemd_timestamp_CFLAGS = \
-       $(AM_CFLAGS)
+dist_dbussystemservice_DATA += \
+       src/hostname/org.freedesktop.hostname1.service
 
-systemd_timestamp_LDADD = \
-       libsystemd-basic.la
+polkitpolicy_in_files += \
+       src/hostname/org.freedesktop.hostname1.policy.in
 
-systemd_ac_power_SOURCES = \
-       src/ac-power.c
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
 
-systemd_ac_power_CFLAGS = \
+org.freedesktop.hostname1.xml: systemd-hostnamed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+hostnamed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.hostname1.service && \
+               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+
+INSTALL_DATA_HOOKS += \
+       hostnamed-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
+systemd_localed_SOURCES = \
+       src/locale/localed.c \
+       src/dbus-common.c \
+       src/polkit.c
+
+systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(DBUS_CFLAGS)
 
-systemd_ac_power_LDADD = \
+systemd_localed_LDADD = \
        libsystemd-basic.la \
-       $(UDEV_LIBS)
-
-systemd_detect_virt_SOURCES = \
-       src/detect-virt.c
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
 
-systemd_detect_virt_CFLAGS = \
-       $(AM_CFLAGS)
+nodist_systemunit_DATA += \
+       units/systemd-localed.service
 
-systemd_detect_virt_LDADD = \
-       libsystemd-basic.la
+rootlibexec_PROGRAMS += \
+       systemd-localed
 
-systemd_cryptsetup_SOURCES = \
-       src/cryptsetup.c \
-       src/ask-password-api.c
+dist_dbuspolicy_DATA += \
+       src/locale/org.freedesktop.locale1.conf
 
-systemd_cryptsetup_CFLAGS = \
-       $(LIBCRYPTSETUP_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(AM_CFLAGS)
+dist_dbussystemservice_DATA += \
+       src/locale/org.freedesktop.locale1.service
 
-systemd_cryptsetup_LDADD = \
-       $(LIBCRYPTSETUP_LIBS) \
-       $(UDEV_LIBS) \
-       libsystemd-basic.la
+polkitpolicy_in_files += \
+       src/locale/org.freedesktop.locale1.policy.in
 
-systemd_cryptsetup_generator_SOURCES = \
-       src/cryptsetup-generator.c \
-       src/unit-name.c
+dbusinterface_DATA += \
+       org.freedesktop.locale1.xml
 
-systemd_cryptsetup_generator_CFLAGS = \
-       $(AM_CFLAGS)
+org.freedesktop.locale1.xml: systemd-localed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
-systemd_cryptsetup_generator_LDADD = \
-       libsystemd-basic.la
+localed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.locale1.service && \
+               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
 
-systemd_getty_generator_SOURCES = \
-       src/getty-generator.c \
-       src/unit-name.c
+INSTALL_DATA_HOOKS += \
+       localed-install-data-hook
 
-systemd_getty_generator_CFLAGS = \
-       $(AM_CFLAGS)
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+endif
 
-systemd_getty_generator_LDADD = \
-       libsystemd-basic.la
+# ------------------------------------------------------------------------------
+if ENABLE_TIMEDATED
+systemd_timedated_SOURCES = \
+       src/timedate/timedated.c \
+       src/dbus-common.c \
+       src/polkit.c
 
-systemd_rc_local_generator_SOURCES = \
-       src/rc-local-generator.c
+systemd_timedated_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
 
-systemd_rc_local_generator_CFLAGS = \
-       $(AM_CFLAGS)
+systemd_timedated_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
 
-systemd_rc_local_generator_LDADD = \
-       libsystemd-basic.la
+rootlibexec_PROGRAMS += \
+       systemd-timedated
 
-systemd_user_sessions_SOURCES = \
-       src/user-sessions.c \
-       src/cgroup-util.c
+dist_dbussystemservice_DATA += \
+       src/timedate/org.freedesktop.timedate1.service
 
-systemd_user_sessions_CFLAGS = \
-       $(AM_CFLAGS)
+dist_dbuspolicy_DATA += \
+       src/timedate/org.freedesktop.timedate1.conf
 
-systemd_user_sessions_LDADD = \
-       libsystemd-basic.la
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
 
-systemd_vconsole_setup_SOURCES = \
-       src/vconsole-setup.c
+polkitpolicy_in_files += \
+       src/timedate/org.freedesktop.timedate1.policy.in
 
-systemd_vconsole_setup_CFLAGS = \
-       $(AM_CFLAGS)
+org.freedesktop.timedate1.xml: systemd-timedated
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
-systemd_vconsole_setup_LDADD = \
-       libsystemd-basic.la
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
 
-systemd_remount_api_vfs_SOURCES = \
-       src/remount-api-vfs.c \
-       src/mount-setup.c \
-       src/exit-status.c
+timedated-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+               $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
 
-systemd_remount_api_vfs_CFLAGS = \
-       $(AM_CFLAGS)
+INSTALL_DATA_HOOKS += \
+       timedated-install-data-hook
 
-systemd_remount_api_vfs_LDADD = \
-       libsystemd-basic.la
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
 
-systemd_cgroups_agent_SOURCES = \
-       src/cgroups-agent.c \
-       src/dbus-common.c
+# ------------------------------------------------------------------------------
+if ENABLE_LOGIND
+systemd_logind_SOURCES = \
+       src/login/logind.c \
+       src/login/logind-dbus.c \
+       src/login/logind-device.c \
+       src/login/logind-seat.c \
+       src/login/logind-seat-dbus.c \
+       src/login/logind-session.c \
+       src/login/logind-session-dbus.c \
+       src/login/logind-user.c \
+       src/login/logind-user-dbus.c \
+       src/dbus-common.c \
+       src/dbus-loop.c \
+       src/cgroup-util.c \
+       src/polkit.c
 
-systemd_cgroups_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+nodist_systemd_logind_SOURCES = \
+       src/login/logind-gperf.c
 
-systemd_cgroups_agent_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
+if HAVE_ACL
+systemd_logind_SOURCES += \
+       src/login/logind-acl.c \
+       src/acl-util.c
+endif
 
-systemd_kmsg_syslogd_SOURCES = \
-       src/kmsg-syslogd.c \
-       src/fdset.c
+systemd_logind_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I $(top_srcdir)/src/login
 
-systemd_kmsg_syslogd_CFLAGS = \
-       $(AM_CFLAGS)
+systemd_logind_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(ACL_CFLAGS)
 
-systemd_kmsg_syslogd_LDADD = \
+systemd_logind_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la
+       libsystemd-daemon.la \
+       $(DBUS_LIBS) \
+       $(UDEV_LIBS) \
+       $(ACL_LIBS)
 
-systemctl_SOURCES = \
-       src/systemctl.c \
-       src/utmp-wtmp.c \
+rootlibexec_PROGRAMS += \
+       systemd-logind
+
+systemd_loginctl_SOURCES = \
+       src/login/loginctl.c \
        src/dbus-common.c \
-       src/path-lookup.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
-       src/exit-status.c \
-       src/unit-name.c \
        src/pager.c \
-       src/install.c \
-       src/spawn-agent.c
+       src/sysfs-show.c
 
-systemctl_CFLAGS = \
+systemd_loginctl_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS) \
+       $(UDEV_CFLAGS)
 
-systemctl_LDADD = \
+systemd_loginctl_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
+       $(DBUS_LIBS) \
+       $(UDEV_LIBS)
 
-systemd_notify_SOURCES = \
-       src/notify.c \
-       src/sd-readahead.c
+rootbin_PROGRAMS += \
+       systemd-loginctl
 
-systemd_notify_LDADD = \
+test_login_SOURCES = \
+       src/login/test-login.c
+
+test_login_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la
+       libsystemd-login.la
 
-systemd_ask_password_SOURCES = \
-       src/ask-password.c \
-       src/ask-password-api.c
+noinst_PROGRAMS += \
+       test-login
 
-systemd_ask_password_LDADD = \
-       libsystemd-basic.la
+libsystemd_login_la_SOURCES = \
+       src/login/sd-login.c \
+       src/cgroup-util.c
 
-systemd_reply_password_SOURCES = \
-       src/reply-password.c
+libsystemd_login_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden
 
-systemd_reply_password_LDADD = \
+libsystemd_login_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
        libsystemd-basic.la
 
-systemd_readahead_collect_SOURCES = \
-       src/readahead-collect.c \
-       src/readahead-common.c
+if HAVE_PAM
+pam_systemd_la_SOURCES = \
+       src/pam-module.c \
+       src/dbus-common.c
 
-systemd_readahead_collect_CFLAGS = \
-       $(UDEV_CFLAGS)
+pam_systemd_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       -fvisibility=hidden
 
-systemd_readahead_collect_LDADD = \
+pam_systemd_la_LDFLAGS = \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -export-symbols-regex '^pam_sm_.*'
+
+pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
-       $(UDEV_LIBS)
-
-systemd_readahead_replay_SOURCES = \
-       src/readahead-replay.c \
-       src/readahead-common.c
+       $(PAM_LIBS) \
+       $(DBUS_LIBS)
 
-systemd_readahead_replay_CFLAGS = \
-       $(UDEV_CFLAGS)
+pamlib_LTLIBRARIES = \
+       pam_systemd.la
+endif
 
-systemd_readahead_replay_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(UDEV_LIBS)
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-login-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+       fi
 
-systemd_cgls_SOURCES = \
-       src/cgls.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c
+INSTALL_EXEC_HOOKS += \
+       libsystemd-login-install-hook
 
-systemd_cgls_CFLAGS = \
-       $(AM_CFLAGS)
+libsystemd-login-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-login-uninstall-hook
 
-systemd_nspawn_SOURCES = \
-       src/nspawn.c \
-       src/cgroup-util.c \
-       src/loopback-setup.c
+nodist_systemunit_DATA += \
+       units/systemd-logind.service
 
-systemd_nspawn_CFLAGS = \
-       $(AM_CFLAGS)
+dist_dbussystemservice_DATA += \
+       src/login/org.freedesktop.login1.service
 
-systemd_nspawn_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
+dist_dbuspolicy_DATA += \
+       src/login/org.freedesktop.login1.conf
 
-systemd_stdio_bridge_SOURCES = \
-       src/bridge.c
+dist_pkgsysconf_DATA += \
+       src/login/systemd-logind.conf
 
-systemd_stdio_bridge_LDADD = \
-       libsystemd-basic.la
+pkginclude_HEADERS += \
+       src/login/sd-login.h
 
-systemadm_SOURCES = \
-       src/systemadm.vala \
-       src/systemd-interfaces.vala \
-       src/wraplabel.vala
+lib_LTLIBRARIES += \
+       libsystemd-login.la
 
-systemadm_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
+pkgconfiglib_DATA += \
+       libsystemd-login.pc
 
-systemadm_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=gee-1.0 \
-       -g
+polkitpolicy_in_files += \
+       src/login/org.freedesktop.login1.policy.in
 
-systemadm_LDADD = \
-       $(GTK_LIBS)
+logind-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.login1.service && \
+               $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f systemd-logind.service && \
+               $(LN_S) ../systemd-logind.service systemd-logind.service )
 
-systemd_gnome_ask_password_agent_SOURCES = \
-       src/gnome-ask-password-agent.vala
+INSTALL_DATA_HOOKS += \
+       logind-install-data-hook
 
-systemd_gnome_ask_password_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBNOTIFY_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
+systemd_uaccess_SOURCES = \
+       src/login/uaccess.c
 
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=linux \
-       --pkg=gio-unix-2.0 \
-       --pkg=libnotify
-if LIBNOTIFY07
-systemd_gnome_ask_password_agent_VALAFLAGS += \
-       -D LIBNOTIFY07
+if HAVE_ACL
+systemd_uaccess_SOURCES += \
+       src/login/logind-acl.c \
+       src/acl-util.c
 endif
-systemd_gnome_ask_password_agent_VALAFLAGS += \
-       -g
 
-systemd_gnome_ask_password_agent_LDADD = \
-       $(LIBNOTIFY_LIBS) \
-       $(GTK_LIBS)
+systemd_uaccess_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(ACL_CFLAGS)
 
-systemd_tty_ask_password_agent_SOURCES = \
-       src/tty-ask-password-agent.c \
-       src/ask-password-api.c \
-       src/utmp-wtmp.c
+systemd_uaccess_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       libsystemd-login.la \
+       $(UDEV_LIBS) \
+       $(ACL_LIBS)
 
-systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-basic.la
+rootlibexec_PROGRAMS += \
+       systemd-uaccess
 
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
+dist_udevrules_DATA += \
+       src/70-uaccess.rules
 
-libsystemd_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden \
-       -DSD_EXPORT_SYMBOLS
+MANPAGES += \
+       man/systemd-logind.conf.5 \
+       man/sd-login.7 \
+       man/systemd-loginctl.1 \
+       man/sd_login_monitor_new.3
 
-libsystemd_daemon_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+MANPAGES_ALIAS += \
+       man/sd_login_monitor_unref.3 \
+       man/sd_login_monitor_flush.3 \
+       man/sd_login_monitor_get_fd.3
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
-       fi
+man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
+man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
+man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+EXTRA_DIST += \
+       src/login/logind-gperf.gperf \
+       units/systemd-logind.service.in \
+       libsystemd-login.pc.in \
+       src/login/libsystemd-login.sym \
+       src/login/logind.h \
+       src/login/logind-device.h \
+       src/login/logind-seat.h \
+       src/login/logind-session.h \
+       src/login/logind-user.h \
+       src/login/logind-acl.h
+
+CLEANFILES += \
+       src/login/logind-gperf.c
+endif
+# ------------------------------------------------------------------------------
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -2338,9 +2348,9 @@ if HAVE_SYSV_COMPAT
                $(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
-install-exec-hook: libsystemd-daemon-install-hook $(INSTALL_EXEC_HOOKS)
+install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-uninstall-hook: libsystemd-daemon-uninstall-hook $(UNINSTALL_EXEC_HOOKS)
+uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)