chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 110a2f4df3a00f359a8792c4b8d1f29bcadf43c9..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
@@ -73,6 +73,7 @@ pkginclude_HEADERS =
 lib_LTLIBRARIES =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
+dist_udevrules_DATA =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -85,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\" \
@@ -98,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 \
@@ -159,7 +161,6 @@ endif
 endif
 
 rootbin_PROGRAMS = \
-       systemd \
        systemctl \
        systemd-notify \
        systemd-ask-password \
@@ -169,6 +170,7 @@ rootbin_PROGRAMS = \
 
 bin_PROGRAMS = \
        systemd-cgls \
+       systemd-cgtop \
        systemd-stdio-bridge \
        systemd-nspawn
 
@@ -182,6 +184,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
+       systemd \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -221,11 +224,7 @@ dist_dbuspolicy_DATA = \
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service
 
-dist_udevrules_DATA = \
-       src/71-seat.rules
-
 nodist_udevrules_DATA = \
-       src/73-seat-late.rules \
        src/99-systemd.rules
 
 dbusinterface_DATA = \
@@ -369,7 +368,6 @@ EXTRA_DIST += \
        units/user@.service.in \
        src/systemd.pc.in \
        introspect.awk \
-       src/73-seat-late.rules.in \
        src/99-systemd.rules.in \
        man/custom-html.xsl
 
@@ -434,6 +432,7 @@ endif
 
 dist_doc_DATA = \
        README \
+        NEWS \
        LICENSE \
        DISTRO_PORTING
 
@@ -547,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 \
@@ -556,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
@@ -655,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 \
@@ -697,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)
@@ -721,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
@@ -860,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
@@ -1008,6 +1016,13 @@ systemd_cgls_SOURCES = \
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
+systemd_cgtop_SOURCES = \
+       src/cgtop.c \
+        src/cgroup-util.c
+
+systemd_cgtop_LDADD = \
+       libsystemd-basic.la
+
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
        src/cgroup-util.c \
@@ -1853,11 +1868,11 @@ rootlibexec_PROGRAMS += \
 
 systemd_loginctl_SOURCES = \
        src/login/loginctl.c \
+       src/login/sysfs-show.c \
        src/dbus-common.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
-       src/pager.c \
-       src/sysfs-show.c
+       src/pager.c
 
 systemd_loginctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1972,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)
@@ -1984,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
 
@@ -2009,7 +2039,13 @@ rootlibexec_PROGRAMS += \
        systemd-uaccess
 
 dist_udevrules_DATA += \
-       src/70-uaccess.rules
+       src/login/70-uaccess.rules
+
+dist_udevrules_DATA += \
+       src/login/71-seat.rules
+
+nodist_udevrules_DATA += \
+       src/login/73-seat-late.rules
 
 MANPAGES += \
        man/systemd-logind.conf.5 \
@@ -2055,8 +2091,6 @@ man/sd_get_uids.3: man/sd_get_seats.3
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
-       units/systemd-logind.service.in \
-       units/systemd-user-sessions.service.in \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
        src/login/logind.h \
@@ -2064,10 +2098,14 @@ EXTRA_DIST += \
        src/login/logind-seat.h \
        src/login/logind-session.h \
        src/login/logind-user.h \
-       src/login/logind-acl.h
+       src/login/logind-acl.h \
+       src/login/73-seat-late.rules.in \
+       units/systemd-logind.service.in \
+       units/systemd-user-sessions.service.in
 
 CLEANFILES += \
-       src/login/logind-gperf.c
+       src/login/logind-gperf.c \
+       src/login/73-seat-late.rules
 endif
 # ------------------------------------------------------------------------------
 
@@ -2144,11 +2182,10 @@ CLEANFILES += \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA) \
-       src/73-seat-late.rules \
-       src/99-systemd.rules \
        src/load-fragment-gperf.gperf \
        src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c
+       src/load-fragment-gperf-nulstr.c \
+       src/99-systemd.rules
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -2480,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:
Unnamed repository; edit this file 'description' to name the repository.