login: track login class (i.e. one of "user", "greeter", "lock-screen") for each...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1df603ba60c5b781fead5ff89de501d8589de4fa..983ea165cc268a12654230d26f1eec3208470117 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,19 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=1
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_REVISION=2
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -86,7 +86,7 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+       -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
@@ -99,6 +99,7 @@ AM_CPPFLAGS = \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+        -DX_SERVER=\"$(bindir)/X\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/readahead \
        -I $(top_srcdir)/src/login \
@@ -160,7 +161,6 @@ endif
 endif
 
 rootbin_PROGRAMS = \
-       systemd \
        systemctl \
        systemd-notify \
        systemd-ask-password \
@@ -184,6 +184,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
+       systemd \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -431,6 +432,7 @@ endif
 
 dist_doc_DATA = \
        README \
+        NEWS \
        LICENSE \
        DISTRO_PORTING
 
@@ -544,7 +546,8 @@ libsystemd_core_la_CFLAGS = \
        $(UDEV_CFLAGS) \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
-       $(AUDIT_CFLAGS)
+       $(AUDIT_CFLAGS) \
+       $(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
@@ -553,7 +556,8 @@ libsystemd_core_la_LIBADD = \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
-       $(CAP_LIBS)
+       $(CAP_LIBS) \
+       $(KMOD_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs. We therefore can't
@@ -652,6 +656,7 @@ MANPAGES = \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
+       man/systemd-cgtop.1 \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
@@ -694,6 +699,7 @@ man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 
+if ENABLE_MANPAGES
 dist_man_MANS = \
        $(MANPAGES) \
        $(MANPAGES_ALIAS)
@@ -718,6 +724,7 @@ EXTRA_DIST += \
        $(XML_IN_FILES) \
        ${nodist_man_MANS:=.in} \
        ${XML_IN_FILES:.xml.in=.html.in}
+endif
 
 systemd_SOURCES = \
        src/main.c
@@ -857,8 +864,12 @@ systemd_shutdown_LDADD = \
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
+systemd_modules_load_CFLAGS = \
+       $(KMOD_CFLAGS)
+
 systemd_modules_load_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       $(KMOD_LIBS)
 
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c
@@ -1976,7 +1987,8 @@ polkitpolicy_in_files += \
 
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+                $(DESTDIR)$(localstatedir)/lib/systemd
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -1988,6 +2000,20 @@ logind-install-data-hook:
 INSTALL_DATA_HOOKS += \
        logind-install-data-hook
 
+systemd_multi_seat_x_SOURCES = \
+       src/login/multi-seat-x.c
+
+systemd_multi_seat_x_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_multi_seat_x_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-multi-seat-x
+
 systemd_uaccess_SOURCES = \
        src/login/uaccess.c
 
@@ -2491,11 +2517,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-       --with-rootprefix=$$dc_install_base/$(rootprefix)
+       --with-rootprefix=$$dc_install_base/$(prefix)
+
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
+       scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
        scp man/*.html tango:public/systemd-man/
 
 git-tag: