chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index b51c522443cf52efbf772827865c4b8d361d3cf2..1991fd0e3b64ceff16de91eae18f8ee793f81ce7 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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/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 \
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/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
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/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 = \
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/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/killall.h \
src/core/killall.c \
src/core/audit-fd.c \
@@
-2954,6
+2953,7
@@
noinst_LTLIBRARIES += \
libsystemd-terminal.la
noinst_PROGRAMS += \
libsystemd-terminal.la
noinst_PROGRAMS += \
+ systemd-evcat \
systemd-subterm
unifontdatadir=$(datadir)/unifont
systemd-subterm
unifontdatadir=$(datadir)/unifont
@@
-2976,6
+2976,7
@@
libsystemd_terminal_la_SOURCES = \
src/libsystemd-terminal/idev-internal.h \
src/libsystemd-terminal/idev.c \
src/libsystemd-terminal/idev-evdev.c \
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/sysview.h \
src/libsystemd-terminal/sysview-internal.h \
src/libsystemd-terminal/sysview.c \
@@
-2994,6
+2995,19
@@
libsystemd_terminal_la_LIBADD = \
libsystemd-shared.la \
$(TERMINAL_LIBS)
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
systemd_subterm_SOURCES = \
src/libsystemd-terminal/subterm.c
@@
-3269,18
+3283,6
@@
libudev_core_la_LIBADD = \
$(BLKID_LIBS) \
$(KMOD_LIBS)
$(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
if HAVE_KMOD
libudev_core_la_SOURCES += \
src/udev/udev-builtin-kmod.c