chiark / gitweb /
units: m4 is not needed for rescue.service
[elogind.git] / Makefile.am
index e091febc1faf828c0728f5fe70741597e1b57ff1..1991fd0e3b64ceff16de91eae18f8ee793f81ce7 100644 (file)
@@ -550,7 +550,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 \
@@ -585,7 +585,6 @@ 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 +867,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 +1110,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 \
@@ -3284,18 +3283,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