udev: remove userspace firmware loading support

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 70faed4acbe7f7941a0e3285a3b85f2cc3910e09..b37ed415541ee872d614590015aca69c06c0e357 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -868,6 +868,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 +1111,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 \
@@ -2954,6 +2954,7 @@ noinst_LTLIBRARIES += \
        libsystemd-terminal.la
 
 noinst_PROGRAMS += \
+       systemd-evcat \
        systemd-subterm
 
 unifontdatadir=$(datadir)/unifont
@@ -2968,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 \
@@ -2981,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
@@ -3259,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