analyze: show unit file loading on plot

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4c5e6fcdf1365b8dc991e117f1fe4fe44f4044d6..54c4582abd46d91da1da761c2385b33060262f7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -280,9 +280,13 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles \
        systemd-machine-id-setup
 
+if ENABLE_TMPFILES
+rootbin_PROGRAMS += \
+       systemd-tmpfiles
+endif
+
 bin_PROGRAMS = \
        systemd-cgls \
        systemd-cgtop \
@@ -336,18 +340,20 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/udevadm
 
+if ENABLE_TMPFILES
 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
+endif
+
+dist_sysctl_DATA = \
+       sysctl.d/50-default.conf
 
 dist_systemunit_DATA = \
        units/graphical.target \
@@ -400,7 +406,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 \
@@ -419,9 +424,6 @@ nodist_systemunit_DATA = \
        units/systemd-remount-fs.service \
        units/systemd-update-utmp.service \
        units/systemd-update-utmp-runlevel.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 \
@@ -465,9 +467,6 @@ EXTRA_DIST += \
        units/systemd-remount-fs.service.in \
        units/systemd-update-utmp.service.in \
        units/systemd-update-utmp-runlevel.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 \
@@ -500,6 +499,19 @@ CLEANFILES += \
        units/console-getty.service.m4 \
        units/rescue.service.m4
 
+if ENABLE_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
+EXTRA_DIST += \
+       units/systemd-tmpfiles-setup-dev.service.in \
+       units/systemd-tmpfiles-setup.service.in \
+       units/systemd-tmpfiles-clean.service.in
+endif
+
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
        units/rc-local.service \
@@ -695,7 +707,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 += \
@@ -1436,6 +1449,7 @@ EXTRA_DIST += \
        units/systemd-modules-load.service.in
 
 # ------------------------------------------------------------------------------
+if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
 
@@ -1443,6 +1457,7 @@ systemd_tmpfiles_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-capability.la
+endif
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -1748,6 +1763,10 @@ libsystemd_bus_la_LIBADD =  \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
+libsystemd_bus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
@@ -1758,6 +1777,8 @@ tests += \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \
+       test-bus-kernel-bloom \
+       test-bus-kernel-benchmark \
        test-bus-memfd \
        test-bus-zero-copy
 
@@ -1831,6 +1852,28 @@ 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
 
@@ -2476,6 +2519,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 \
@@ -4085,12 +4129,16 @@ 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
+
+if ENABLE_TMPFILES
+SYSINIT_TARGET_WANTS += \
+       systemd-tmpfiles-setup-dev.service \
+       systemd-tmpfiles-setup.service
 TIMERS_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
+endif
 
 if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \
@@ -4134,8 +4182,6 @@ INSTALL_DIRS += \
 endif
 
 INSTALL_DIRS += \
-       $(tmpfilesdir) \
-       $(sysconfdir)/tmpfiles.d \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
        $(prefix)/lib/sysctl.d \
@@ -4155,6 +4201,12 @@ INSTALL_DIRS += \
        $(dbussessionservicedir) \
        $(sysconfdir)/xdg/systemd
 
+if ENABLE_TMPFILES
+INSTALL_DIRS += \
+       $(tmpfilesdir) \
+       $(sysconfdir)/tmpfiles.d
+endif
+
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)