chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd-journal-upload: fix invalid After=
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3a263f8c17e1a94d301822d7443a1ca251b4eaff..1facb8da436a6f3428e3d0d184a87e2d302b919b 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/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
+1111,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
+2954,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
@@
-2968,9
+2969,15
@@
tests += \
endif
libsystemd_terminal_la_CFLAGS = \
endif
libsystemd_terminal_la_CFLAGS = \
- $(AM_CFLAGS)
+ $(AM_CFLAGS) \
+ $(TERMINAL_CFLAGS)
libsystemd_terminal_la_SOURCES = \
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/sysview.h \
src/libsystemd-terminal/sysview-internal.h \
src/libsystemd-terminal/sysview.c \
@@
-2986,7
+2993,21
@@
libsystemd_terminal_la_SOURCES = \
libsystemd_terminal_la_LIBADD = \
libudev-internal.la \
libsystemd-internal.la \
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
systemd_subterm_SOURCES = \
src/libsystemd-terminal/subterm.c