chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
man: document systemd-journal
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 65a28983b04b4085449cee8380b2d53e0af73a8f..597711ea7122597b6340cd2628b92423ff328c6f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ AM_MAKEFLAGS = --no-print-directory
 SUBDIRS = . po
 
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
@@ -32,20 +32,20 @@ LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=3
+LIBSYSTEMD_ID128_REVISION=5
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=3
-LIBSYSTEMD_JOURNAL_AGE=0
+LIBSYSTEMD_JOURNAL_CURRENT=1
+LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_AGE=1
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -129,6 +129,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
@@ -490,23 +491,32 @@ MANPAGES = \
        man/os-release.5 \
        man/machine-info.5 \
        man/modules-load.d.5 \
+       man/systemd-modules-load.service.8 \
        man/sysctl.d.5 \
+       man/systemd-sysctl.service.8 \
        man/systemd-ask-password.1 \
        man/systemd-cat.1 \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \
+       man/systemd-journald.service.8 \
        man/journalctl.1 \
        man/systemd-inhibit.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/init.1
+       man/init.1 \
+       man/systemd-modules-load.8 \
+       man/systemd-sysctl.8 \
+       man/systemd-journald.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.8: man/systemd-journald.service.8
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -606,13 +616,23 @@ libsystemd_dbus_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-label.la
+       libsystemd-units.la
 
-libsystemd_label_la_SOURCES = \
+libsystemd_units_la_SOURCES = \
        src/shared/install.c \
        src/shared/install.h \
        src/shared/path-lookup.c \
-       src/shared/path-lookup.h \
+       src/shared/path-lookup.h
+
+libsystemd_units_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
        src/shared/cgroup-label.c \
        src/shared/socket-label.c \
        src/shared/label.c \
@@ -626,7 +646,6 @@ libsystemd_label_la_SOURCES = \
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_label_la_LIBADD = \
@@ -810,6 +829,7 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-dbus.la \
@@ -980,6 +1000,7 @@ test_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -1191,6 +1212,7 @@ systemctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
@@ -2083,9 +2105,13 @@ systemd_journald_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-login.la \
        libsystemd-id128.la
 
+if ENABLE_LOGIND
+systemd_journald_LDADD += \
+       libsystemd-login.la
+endif
+
 if HAVE_ACL
 systemd_journald_LDADD += \
        libsystemd-acl.la
@@ -2263,10 +2289,14 @@ systemd_coredump_SOURCES = \
 
 systemd_coredump_LDADD = \
        libsystemd-journal.la \
-       libsystemd-login.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
+if ENABLE_LOGIND
+systemd_coredump_LDADD += \
+       libsystemd-login.la
+endif
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
@@ -2313,7 +2343,13 @@ INSTALL_DATA_HOOKS += \
        binfmt-install-data-hook
 
 MANPAGES += \
-       man/binfmt.d.5
+       man/binfmt.d.5 \
+       man/systemd-binfmt.service.8
+
+MANPAGES_ALIAS +=  \
+       man/systemd-binfmt.8
+
+man/systemd-binfmt.8: man/systemd-binfmt.service.8
 
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
@@ -2658,6 +2694,8 @@ systemd_logind_SOURCES = \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
+       src/login/logind-button.c \
+       src/login/logind-button.h \
        src/login/logind-seat.c \
        src/login/logind-seat.h \
        src/login/logind-session.c \
@@ -2873,12 +2911,14 @@ rootlibexec_PROGRAMS += \
 
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
-       src/login/71-seat.rules
+       src/login/70-power-switch.rules
 
 nodist_udevrules_DATA += \
+       src/login/71-seat.rules \
        src/login/73-seat-late.rules
 
 MANPAGES += \
+       man/systemd-logind.service.8 \
        man/logind.conf.5 \
        man/sd-login.7 \
        man/loginctl.1 \
@@ -2890,6 +2930,7 @@ MANPAGES += \
        man/sd_get_seats.3
 
 MANPAGES_ALIAS += \
+       man/systemd-logind.8 \
        man/sd_login_monitor_unref.3 \
        man/sd_login_monitor_flush.3 \
        man/sd_login_monitor_get_fd.3 \
@@ -2909,6 +2950,7 @@ MANPAGES_ALIAS += \
        man/sd_get_sessions.3 \
        man/sd_get_uids.3
 
+man/systemd-logind.8: man/systemd-logind.service.8
 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
@@ -2932,12 +2974,14 @@ EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
+       src/login/71-seat.rules.in \
        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/71-seat.rules \
        src/login/73-seat-late.rules
 endif
 # ------------------------------------------------------------------------------
Unnamed repository; edit this file 'description' to name the repository.