localed: introduce helper function to simplify matching

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 82f474e20eabaf05c49726d2c0d80bc270b3892d..58e5ce6c547152814758b9aa5d9d78c9628224b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,15 +378,13 @@ rootlibexec_PROGRAMS = \
        systemd-sleep \
        systemd-bus-proxyd \
        systemd-socket-proxyd \
-       systemd-update-done \
-       systemd-hibernate-resume
+       systemd-update-done
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
        systemd-system-update-generator \
-       systemd-debug-generator \
-       systemd-hibernate-resume-generator
+       systemd-debug-generator
 
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
@@ -453,7 +451,6 @@ dist_systemunit_DATA = \
        units/network-online.target \
        units/nss-lookup.target \
        units/nss-user-lookup.target \
-       units/hibernate.target \
        units/hybrid-sleep.target \
        units/poweroff.target \
        units/reboot.target \
@@ -511,7 +508,6 @@ nodist_systemunit_DATA = \
        units/emergency.service \
        units/rescue.service \
        units/user@.service \
-       units/systemd-hibernate.service \
        units/systemd-hybrid-sleep.service \
        units/systemd-suspend.service \
        units/systemd-halt.service \
@@ -530,8 +526,7 @@ nodist_systemunit_DATA = \
        units/initrd-udevadm-cleanup-db.service \
        units/initrd-switch-root.service \
        units/systemd-nspawn@.service \
-       units/systemd-update-done.service \
-       units/systemd-hibernate-resume@.service
+       units/systemd-update-done.service
 
 dist_userunit_DATA = \
        units/user/basic.target \
@@ -550,7 +545,7 @@ EXTRA_DIST += \
        units/console-shell.service.m4.in \
        units/console-getty.service.m4.in \
        units/container-getty@.service.m4.in \
-       units/rescue.service.m4.in \
+       units/rescue.service.in \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-remount-fs.service.in \
@@ -569,7 +564,6 @@ EXTRA_DIST += \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
        units/debug-shell.service.in \
-       units/systemd-hibernate.service.in \
        units/systemd-hybrid-sleep.service.in \
        units/systemd-suspend.service.in \
        units/quotaon.service.in \
@@ -578,14 +572,12 @@ EXTRA_DIST += \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
        units/systemd-nspawn@.service.in \
-       units/systemd-update-done.service.in \
-       units/systemd-hibernate-resume@.service.in
+       units/systemd-update-done.service.in
 
 CLEANFILES += \
        units/console-shell.service.m4 \
        units/console-getty.service.m4 \
        units/container-getty@.service.m4 \
-       units/rescue.service.m4 \
        units/user@.service.m4
 
 if HAVE_SYSV_COMPAT
@@ -868,6 +860,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/memfd.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
+       src/shared/switch-root.h \
+       src/shared/switch-root.c \
        src/shared/nss-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
@@ -1109,8 +1103,6 @@ libsystemd_core_la_SOURCES = \
        src/core/namespace.h \
        src/core/build.h \
        src/core/sysfs-show.h \
-       src/core/switch-root.h \
-       src/core/switch-root.c \
        src/core/killall.h \
        src/core/killall.c \
        src/core/audit-fd.c \
@@ -2112,14 +2104,6 @@ systemd_delta_SOURCES = \
 systemd_delta_LDADD = \
        libsystemd-shared.la
 
-# ------------------------------------------------------------------------------
-systemd_hibernate_resume_SOURCES = \
-       src/hibernate-resume/hibernate-resume.c
-
-systemd_hibernate_resume_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
        src/getty-generator/getty-generator.c
@@ -2154,6 +2138,20 @@ systemd_system_update_generator_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_HIBERNATE
+systemgenerator_PROGRAMS += \
+        systemd-hibernate-resume-generator
+
+rootlibexec_PROGRAMS += \
+        systemd-hibernate-resume
+
+systemd_hibernate_resume_SOURCES = \
+        src/hibernate-resume/hibernate-resume.c
+
+systemd_hibernate_resume_LDADD = \
+        libsystemd-internal.la \
+        libsystemd-shared.la
+
 systemd_hibernate_resume_generator_SOURCES = \
        src/resume-generator/resume-generator.c
 
@@ -2161,8 +2159,21 @@ systemd_hibernate_resume_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
-if ENABLE_EFI
+EXTRA_DIST += \
+        units/systemd-hibernate.service.in \
+        units/systemd-hibernate-resume@.service.in
+
+dist_systemunit_DATA += \
+        units/hibernate.target
+
+nodist_systemunit_DATA += \
+        units/systemd-hibernate.service \
+        units/systemd-hibernate-resume@.service
+
+endif
+
 # ------------------------------------------------------------------------------
+if ENABLE_EFI
 systemgenerator_PROGRAMS +=  \
        systemd-efi-boot-generator
 
@@ -2954,6 +2965,7 @@ noinst_LTLIBRARIES += \
        libsystemd-terminal.la
 
 noinst_PROGRAMS += \
+       systemd-evcat \
        systemd-subterm
 
 unifontdatadir=$(datadir)/unifont
@@ -2968,12 +2980,15 @@ tests += \
 endif
 
 libsystemd_terminal_la_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
 
 libsystemd_terminal_la_SOURCES = \
        src/libsystemd-terminal/idev.h \
        src/libsystemd-terminal/idev-internal.h \
        src/libsystemd-terminal/idev.c \
+       src/libsystemd-terminal/idev-evdev.c \
+       src/libsystemd-terminal/idev-keyboard.c \
        src/libsystemd-terminal/sysview.h \
        src/libsystemd-terminal/sysview-internal.h \
        src/libsystemd-terminal/sysview.c \
@@ -2989,7 +3004,21 @@ libsystemd_terminal_la_SOURCES = \
 libsystemd_terminal_la_LIBADD = \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
+
+systemd_evcat_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
+
+systemd_evcat_SOURCES = \
+       src/libsystemd-terminal/evcat.c
+
+systemd_evcat_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
 
 systemd_subterm_SOURCES = \
        src/libsystemd-terminal/subterm.c
@@ -3266,18 +3295,6 @@ libudev_core_la_LIBADD = \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
-libudev_core_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
-
-if ENABLE_FIRMWARE
-libudev_core_la_SOURCES += \
-       src/udev/udev-builtin-firmware.c
-
-dist_udevrules_DATA += \
-       rules/50-firmware.rules
-endif
-
 if HAVE_KMOD
 libudev_core_la_SOURCES += \
        src/udev/udev-builtin-kmod.c