chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
udev: remove userspace firmware loading support
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index fa6fd7d541422b13e2bcba148c491fd2f0883ad4..b37ed415541ee872d614590015aca69c06c0e357 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,17 +35,17 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBUDEV_CURRENT=6
+LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=0
-LIBUDEV_AGE=5
+LIBUDEV_AGE=6
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
-LIBSYSTEMD_CURRENT=3
-LIBSYSTEMD_REVISION=1
-LIBSYSTEMD_AGE=3
+LIBSYSTEMD_CURRENT=4
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=4
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -378,13 +378,15 @@ rootlibexec_PROGRAMS = \
        systemd-sleep \
        systemd-bus-proxyd \
        systemd-socket-proxyd \
-       systemd-update-done
+       systemd-update-done \
+       systemd-hibernate-resume
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
        systemd-system-update-generator \
-       systemd-debug-generator
+       systemd-debug-generator \
+       systemd-hibernate-resume-generator
 
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
@@ -490,8 +492,7 @@ dist_systemunit_DATA = \
        units/systemd-udevd-control.socket \
        units/systemd-udevd-kernel.socket \
        units/system-update.target \
-       units/initrd-switch-root.target \
-       units/ldconfig.service
+       units/initrd-switch-root.target
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -529,7 +530,8 @@ 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-update-done.service \
+       units/systemd-hibernate-resume@.service
 
 dist_userunit_DATA = \
        units/user/basic.target \
@@ -576,7 +578,8 @@ 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-update-done.service.in \
+       units/systemd-hibernate-resume@.service.in
 
 CLEANFILES += \
        units/console-shell.service.m4 \
@@ -861,6 +864,12 @@ libsystemd_shared_la_SOURCES = \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
+       src/shared/memfd.c \
+       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 = \
@@ -919,6 +928,16 @@ libsystemd_label_la_CFLAGS = \
 libsystemd_label_la_LIBADD = \
        $(SELINUX_LIBS)
 
+# -----------------------------------------------------------------------------
+
+if ENABLE_LDCONFIG
+dist_systemunit_DATA += \
+       units/ldconfig.service
+
+SYSINIT_TARGET_WANTS += \
+       ldconfig.service
+endif
+
 # ------------------------------------------------------------------------------
 
 if HAVE_SECCOMP
@@ -1092,14 +1111,14 @@ 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 \
        src/core/audit-fd.h \
        src/core/show-status.c \
-       src/core/show-status.h
+       src/core/show-status.h \
+       src/core/failure-action.c \
+       src/core/failure-action.h
 
 if HAVE_KMOD
 libsystemd_core_la_SOURCES += \
@@ -1310,7 +1329,9 @@ tests += \
        test-conf-files \
        test-capability \
        test-async \
-       test-ratelimit
+       test-ratelimit \
+       test-condition-util \
+       test-uid-range
 
 EXTRA_DIST += \
        test/a.service \
@@ -1449,6 +1470,14 @@ test_async_SOURCES = \
 test_async_LDADD = \
        libsystemd-shared.la
 
+test_condition_util_SOURCES = \
+       src/test/test-condition-util.c
+
+test_condition_util_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la
+
+
 test_fdset_SOURCES = \
        src/test/test-fdset.c
 
@@ -1467,6 +1496,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libsystemd-core.la
 
+test_uid_range_SOURCES = \
+       src/test/test-uid-range.c
+
+test_uid_range_LDADD = \
+       libsystemd-core.la
+
 test_socket_util_SOURCES = \
        src/test/test-socket-util.c
 
@@ -1905,14 +1940,16 @@ nodist_systemunit_DATA += \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service
 
+nodist_tmpfiles_DATA = \
+       tmpfiles.d/etc.conf
+
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/systemd-remote.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
-       tmpfiles.d/var.conf \
-       tmpfiles.d/etc.conf
+       tmpfiles.d/var.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -1935,10 +1972,14 @@ INSTALL_DIRS += \
 endif
 
 EXTRA_DIST += \
+       tmpfiles.d/etc.conf.m4 \
        units/systemd-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in
 
+CLEANFILES += \
+       tmpfiles.d/etc.conf
+
 # ------------------------------------------------------------------------------
 if ENABLE_SYSUSERS
 systemd_sysusers_SOURCES = \
@@ -2071,6 +2112,14 @@ 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
@@ -2104,6 +2153,14 @@ systemd_system_update_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_hibernate_resume_generator_SOURCES = \
+       src/resume-generator/resume-generator.c
+
+systemd_hibernate_resume_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 if ENABLE_EFI
 # ------------------------------------------------------------------------------
 systemgenerator_PROGRAMS +=  \
@@ -2373,7 +2430,6 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
-       src/systemd/sd-memfd.h \
        src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
        src/systemd/sd-rtnl.h \
@@ -2423,7 +2479,6 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-slot.h \
        src/libsystemd/sd-bus/bus-protocol.h \
        src/libsystemd/sd-bus/kdbus.h \
-       src/libsystemd/sd-bus/sd-memfd.c \
        src/libsystemd/sd-utf8/sd-utf8.c \
        src/libsystemd/sd-event/sd-event.c \
        src/libsystemd/sd-event/event-util.h \
@@ -2541,7 +2596,6 @@ pkginclude_HEADERS += \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
-       src/systemd/sd-memfd.h \
        src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
        src/systemd/sd-rtnl.h \
@@ -2562,7 +2616,6 @@ tests += \
        test-bus-kernel \
        test-bus-kernel-bloom \
        test-bus-kernel-benchmark \
-       test-bus-memfd \
        test-bus-zero-copy \
        test-bus-introspect \
        test-bus-objects \
@@ -2716,13 +2769,6 @@ test_bus_kernel_benchmark_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
-test_bus_memfd_SOURCES = \
-       src/libsystemd/sd-bus/test-bus-memfd.c
-
-test_bus_memfd_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
 test_bus_zero_copy_SOURCES = \
        src/libsystemd/sd-bus/test-bus-zero-copy.c
 
@@ -2908,6 +2954,7 @@ noinst_LTLIBRARIES += \
        libsystemd-terminal.la
 
 noinst_PROGRAMS += \
+       systemd-evcat \
        systemd-subterm
 
 unifontdatadir=$(datadir)/unifont
@@ -2922,9 +2969,18 @@ 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 \
        src/libsystemd-terminal/term-internal.h \
        src/libsystemd-terminal/term-charset.c \
        src/libsystemd-terminal/term-page.c \
@@ -2935,8 +2991,23 @@ libsystemd_terminal_la_SOURCES = \
        src/libsystemd-terminal/unifont.c
 
 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
@@ -3213,18 +3284,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
@@ -4772,6 +4831,7 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-bus.h \
        src/resolve/resolved-link.h \
        src/resolve/resolved-link.c \
+       src/resolve/resolved-def.h \
        src/resolve/resolved-dns-domain.h \
        src/resolve/resolved-dns-domain.c \
        src/resolve/resolved-dns-rr.h \
@@ -5667,6 +5727,11 @@ src/%: src/%.m4
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
+tmpfiles.d/%: tmpfiles.d/%.m4
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
+
 units/%: units/%.m4
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
@@ -5789,8 +5854,7 @@ endif
 
 SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service \
-       systemd-update-done.service \
-       ldconfig.service
+       systemd-update-done.service
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
Unnamed repository; edit this file 'description' to name the repository.