chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build-sys: make intltool and distcheck happy
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index cba9a3e6098e876c364fc30dfcfa2a298100eb50..016d7dad3264dd226f12edf58785e3b07a21aa97 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,27 +32,27 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=6
-LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=6
+LIBSYSTEMD_LOGIN_CURRENT=7
+LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_AGE=7
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=21
+LIBSYSTEMD_ID128_REVISION=23
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=10
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=10
 
 # Dirs of external packages
@@ -138,12 +138,11 @@ udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
-       -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
+       -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-       -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
@@ -165,6 +164,7 @@ AM_CPPFLAGS = \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -DQUOTACHECK=\"$(QUOTACHECK)\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/login \
@@ -222,6 +222,7 @@ install-target-wants-hook:
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
+       what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
 
 define add-wants
        [ -z "$$what" ] || ( \
@@ -244,8 +245,8 @@ install-aliases-hook:
                dir= && $(install-aliases)
 
 define install-aliases
-       $(MKDIR_P) /$(DESTDIR)$$dir && \
        while [ -n "$$1" ]; do \
+               $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
                rm -f $(DESTDIR)$$dir/$$2 && \
                $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
                shift 2 || exit $$?; \
@@ -280,7 +281,6 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles \
        systemd-machine-id-setup
 
 bin_PROGRAMS = \
@@ -336,19 +336,9 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/udevadm
 
-dist_tmpfiles_DATA = \
-       tmpfiles.d/systemd.conf \
-       tmpfiles.d/tmp.conf \
-       tmpfiles.d/x11.conf
-
 dist_sysctl_DATA = \
        sysctl.d/50-default.conf
 
-if HAVE_SYSV_COMPAT
-dist_tmpfiles_DATA += \
-       tmpfiles.d/legacy.conf
-endif
-
 dist_systemunit_DATA = \
        units/graphical.target \
        units/multi-user.target \
@@ -387,6 +377,8 @@ dist_systemunit_DATA = \
        units/paths.target \
        units/suspend.target \
        units/swap.target \
+       units/slices.target \
+       units/system.slice \
        units/systemd-initctl.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
@@ -400,8 +392,6 @@ dist_systemunit_DATA = \
        units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \
-       units/systemd-tmpfiles-clean.timer \
-       units/quotaon.service \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/systemd-udevd-control.socket \
@@ -417,11 +407,8 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
+       units/systemd-update-utmp.service \
        units/systemd-update-utmp-runlevel.service \
-       units/systemd-update-utmp-shutdown.service \
-       units/systemd-tmpfiles-setup-dev.service \
-       units/systemd-tmpfiles-setup.service \
-       units/systemd-tmpfiles-clean.service \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
@@ -463,11 +450,8 @@ EXTRA_DIST += \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-remount-fs.service.in \
+       units/systemd-update-utmp.service.in \
        units/systemd-update-utmp-runlevel.service.in \
-       units/systemd-update-utmp-shutdown.service.in \
-       units/systemd-tmpfiles-setup-dev.service.in \
-       units/systemd-tmpfiles-setup.service.in \
-       units/systemd-tmpfiles-clean.service.in \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
@@ -530,6 +514,9 @@ MANPAGES_ALIAS =
 
 include Makefile-man.am
 
+.PHONY: man
+man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
+
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
 HTML_FILES = \
@@ -642,6 +629,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fdset.h \
        src/shared/prioq.c \
        src/shared/prioq.h \
+       src/shared/sleep-config.c \
+       src/shared/sleep-config.h \
        src/shared/strv.c \
        src/shared/strv.h \
        src/shared/env-util.c \
@@ -693,7 +682,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \
-       src/shared/MurmurHash3.h
+       src/shared/MurmurHash3.h \
+       src/shared/refcnt.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -856,6 +846,8 @@ libsystemd_core_la_SOURCES = \
        src/core/timer.h \
        src/core/path.c \
        src/core/path.h \
+       src/core/slice.c \
+       src/core/slice.h \
        src/core/load-dropin.c \
        src/core/load-dropin.h \
        src/core/execute.c \
@@ -894,6 +886,8 @@ libsystemd_core_la_SOURCES = \
        src/core/dbus-kill.h \
        src/core/dbus-path.c \
        src/core/dbus-path.h \
+       src/core/dbus-slice.c \
+       src/core/dbus-slice.h \
        src/core/cgroup.c \
        src/core/cgroup.h \
        src/core/selinux-access.c \
@@ -1434,6 +1428,7 @@ EXTRA_DIST += \
        units/systemd-modules-load.service.in
 
 # ------------------------------------------------------------------------------
+if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
 
@@ -1442,6 +1437,44 @@ systemd_tmpfiles_LDADD = \
        libsystemd-shared.la \
        libsystemd-capability.la
 
+rootbin_PROGRAMS += \
+       systemd-tmpfiles
+
+dist_systemunit_DATA += \
+       units/systemd-tmpfiles-clean.timer
+
+nodist_systemunit_DATA += \
+       units/systemd-tmpfiles-setup-dev.service \
+       units/systemd-tmpfiles-setup.service \
+       units/systemd-tmpfiles-clean.service
+
+dist_tmpfiles_DATA = \
+       tmpfiles.d/systemd.conf \
+       tmpfiles.d/tmp.conf \
+       tmpfiles.d/x11.conf
+
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+       tmpfiles.d/legacy.conf
+endif
+
+SYSINIT_TARGET_WANTS += \
+       systemd-tmpfiles-setup-dev.service \
+       systemd-tmpfiles-setup.service
+
+TIMERS_TARGET_WANTS += \
+       systemd-tmpfiles-clean.timer
+
+INSTALL_DIRS += \
+       $(tmpfilesdir) \
+       $(sysconfdir)/tmpfiles.d
+endif
+
+EXTRA_DIST += \
+       units/systemd-tmpfiles-setup-dev.service.in \
+       units/systemd-tmpfiles-setup.service.in \
+       units/systemd-tmpfiles-clean.service.in
+
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup/machine-id-setup-main.c \
@@ -1540,8 +1573,8 @@ systemd_system_update_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
-# ------------------------------------------------------------------------------
 if ENABLE_EFI
+# ------------------------------------------------------------------------------
 systemgenerator_PROGRAMS +=  \
        systemd-efi-boot-generator
 
@@ -1551,6 +1584,22 @@ systemd_efi_boot_generator_SOURCES = \
 systemd_efi_boot_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+bootctl_SOURCES = \
+       src/boot/boot.h \
+       src/boot/boot-loader.h \
+       src/boot/bootctl.c \
+       src/boot/boot-loader.c \
+       src/boot/boot-efi.c
+
+bootctl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-id128.la \
+       libsystemd-daemon.la
+
+bin_PROGRAMS += \
+       bootctl
 endif
 
 # ------------------------------------------------------------------------------
@@ -1650,7 +1699,8 @@ systemd_nspawn_LDADD = \
        libsystemd-capability.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
@@ -1716,6 +1766,7 @@ EXTRA_DIST += \
 libsystemd_bus_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-memfd.h \
        src/libsystemd-bus/sd-bus.c \
        src/libsystemd-bus/bus-control.c \
        src/libsystemd-bus/bus-control.h \
@@ -1737,13 +1788,18 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-match.h \
        src/libsystemd-bus/bus-bloom.c \
        src/libsystemd-bus/bus-bloom.h \
-       src/libsystemd-bus/kdbus.h
+       src/libsystemd-bus/kdbus.h \
+       src/libsystemd-bus/sd-memfd.c
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
+libsystemd_bus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
@@ -1753,7 +1809,11 @@ tests += \
        test-bus-chat \
        test-bus-server \
        test-bus-match \
-       test-bus-kernel
+       test-bus-kernel \
+       test-bus-kernel-bloom \
+       test-bus-kernel-benchmark \
+       test-bus-memfd \
+       test-bus-zero-copy
 
 noinst_PROGRAMS += \
        busctl
@@ -1825,6 +1885,48 @@ test_bus_kernel_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
+test_bus_kernel_bloom_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_bloom_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_kernel_benchmark_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel-benchmark.c
+
+test_bus_kernel_benchmark_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_benchmark_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_memfd_SOURCES = \
+       src/libsystemd-bus/test-bus-memfd.c
+
+test_bus_memfd_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_memfd_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+test_bus_zero_copy_SOURCES = \
+       src/libsystemd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_zero_copy_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
@@ -2450,6 +2552,7 @@ dist_udevkeymap_DATA = \
        keymaps/lenovo-thinkpad_x6_tablet \
        keymaps/lenovo-thinkpad_x200_tablet \
        keymaps/lg-x110 \
+       keymaps/logitech-usb \
        keymaps/logitech-wave \
        keymaps/logitech-wave-cordless \
        keymaps/logitech-wave-pro-cordless \
@@ -2688,6 +2791,14 @@ test_journal_verify_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
+test_journal_interleaving_SOURCES = \
+       src/journal/test-journal-interleaving.c
+
+test_journal_interleaving_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
 test_mmap_cache_SOURCES = \
        src/journal/test-mmap-cache.c
 
@@ -2863,6 +2974,7 @@ tests += \
        test-journal-match \
        test-journal-stream \
        test-journal-verify \
+       test-journal-interleaving \
        test-mmap-cache \
        test-catalog
 
@@ -3136,8 +3248,7 @@ rootlibexec_PROGRAMS += \
        systemd-random-seed
 
 nodist_systemunit_DATA += \
-       units/systemd-random-seed-save.service \
-       units/systemd-random-seed-load.service
+       units/systemd-random-seed.service
 
 systemd_random_seed_SOURCES = \
        src/random-seed/random-seed.c
@@ -3146,16 +3257,13 @@ systemd_random_seed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
-SHUTDOWN_TARGET_WANTS += \
-       systemd-random-seed-save.service
 SYSINIT_TARGET_WANTS += \
-       systemd-random-seed-load.service
+       systemd-random-seed.service
 
 endif
 
 EXTRA_DIST += \
-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in
+       units/systemd-random-seed.service.in
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
@@ -3405,24 +3513,6 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 
-# ------------------------------------------------------------------------------
-if ENABLE_EFI
-bootctl_SOURCES = \
-       src/boot/boot.h \
-       src/boot/boot-loader.h \
-       src/boot/bootctl.c \
-       src/boot/boot-loader.c \
-       src/boot/boot-efi.c
-
-bootctl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-id128.la \
-       libsystemd-daemon.la
-
-bin_PROGRAMS += \
-       bootctl
-endif
-
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
@@ -3461,6 +3551,8 @@ systemd_logind_SOURCES = \
        src/login/logind-seat.h \
        src/login/logind-session.c \
        src/login/logind-session.h \
+       src/login/logind-machine.c \
+       src/login/logind-machine.h \
        src/login/logind-user.c \
        src/login/logind-user.h \
        src/login/logind-inhibit.c \
@@ -3468,6 +3560,7 @@ systemd_logind_SOURCES = \
        src/login/logind-session-dbus.c \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
+       src/login/logind-machine-dbus.c \
        src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
@@ -3483,6 +3576,7 @@ systemd_logind_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
        libsystemd-dbus.la \
+       libsystemd-id128-internal.la \
        libudev.la
 
 if HAVE_ACL
@@ -3620,6 +3714,10 @@ nodist_systemunit_DATA += \
        units/systemd-logind.service \
        units/systemd-user-sessions.service
 
+dist_systemunit_DATA += \
+       units/user.slice \
+       units/machine.slice
+
 dist_dbussystemservice_DATA += \
        src/login/org.freedesktop.login1.service
 
@@ -3696,7 +3794,8 @@ pkgpyexec_LTLIBRARIES = \
        _journal.la \
        id128.la \
        _daemon.la \
-       _reader.la
+       _reader.la \
+       login.la
 
 _journal_la_SOURCES = \
        src/python-systemd/_journal.c
@@ -3782,6 +3881,29 @@ _reader_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-daemon-internal.la
 
+login_la_SOURCES = \
+       src/python-systemd/login.c \
+       src/python-systemd/pyutil.c \
+       src/python-systemd/pyutil.h
+
+login_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=default \
+       $(PYTHON_CFLAGS)
+
+login_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -shared \
+       -module \
+       -avoid-version
+
+login_la_LIBADD = \
+       $(PYTHON_LIBS) \
+       libsystemd-journal.la \
+       libsystemd-login.la \
+       libsystemd-shared.la \
+       libsystemd-daemon-internal.la
+
 dist_pkgpyexec_PYTHON = \
        src/python-systemd/journal.py \
        src/python-systemd/daemon.py \
@@ -3800,6 +3922,10 @@ sphinx-%:
        $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
        $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
 
+python-shell:
+       $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
+       $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
+
 destdir-sphinx: all
        dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
                $(MAKE) DESTDIR="$$dir" install && \
@@ -4020,8 +4146,8 @@ RUNLEVEL4_TARGET_WANTS += \
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif
-SHUTDOWN_TARGET_WANTS += \
-       systemd-update-utmp-shutdown.service
+SYSINIT_TARGET_WANTS += \
+       systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
        systemd-fsck-root.service \
@@ -4035,12 +4161,8 @@ SYSINIT_TARGET_WANTS += \
        sys-kernel-config.mount \
        sys-kernel-debug.mount \
        sys-fs-fuse-connections.mount \
-       systemd-tmpfiles-setup-dev.service \
-       systemd-tmpfiles-setup.service \
        systemd-sysctl.service \
        systemd-ask-password-console.path
-TIMERS_TARGET_WANTS += \
-       systemd-tmpfiles-clean.timer
 
 if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \
@@ -4084,8 +4206,6 @@ INSTALL_DIRS += \
 endif
 
 INSTALL_DIRS += \
-       $(tmpfilesdir) \
-       $(sysconfdir)/tmpfiles.d \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
        $(prefix)/lib/sysctl.d \
Unnamed repository; edit this file 'description' to name the repository.