chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: Fix compilation of nspawn when seccomp is not enabled
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 08b94d7b1483f7d1e662e6d3a937e95e7d56b893..56cdb85684919ace3fda03908afc8917e0f7de07 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-674,6
+674,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
+ src/shared/architecture.c \
+ src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/path-util.c \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/path-util.c \
@@
-766,7
+768,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/audit.c \
src/shared/audit.h \
src/shared/xml.c \
src/shared/audit.c \
src/shared/audit.h \
src/shared/xml.c \
- src/shared/xml.h
+ src/shared/xml.h \
+ src/shared/condition-util.c \
+ src/shared/condition-util.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1148,7
+1152,8
@@
tests += \
test-list \
test-tables \
test-device-nodes \
test-list \
test-tables \
test-device-nodes \
- test-xml
+ test-xml \
+ test-architecture
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1296,6
+1301,12
@@
test_time_SOURCES = \
test_time_LDADD = \
libsystemd-core.la
test_time_LDADD = \
libsystemd-core.la
+test_architecture_SOURCES = \
+ src/test/test-architecture.c
+
+test_architecture_LDADD = \
+ libsystemd-shared.la
+
test_log_SOURCES = \
src/test/test-log.c
test_log_SOURCES = \
src/test/test-log.c
@@
-1726,6
+1737,9
@@
bootctl_LDADD = \
bin_PROGRAMS += \
bootctl
bin_PROGRAMS += \
bootctl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/bootctl
+
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
@@
-1868,9
+1882,13
@@
systemd_nspawn_LDADD = \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la \
+ libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
libsystemd-seccomp.la \
$(SECCOMP_LIBS)
libsystemd-seccomp.la \
$(SECCOMP_LIBS)
+endif
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
@@
-3923,7
+3941,8
@@
systemd_networkd_SOURCES = \
src/network/networkd-manager.c
nodist_systemd_networkd_SOURCES = \
src/network/networkd-manager.c
nodist_systemd_networkd_SOURCES = \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
systemd_networkd_LDADD = \
libudev-internal.la \
systemd_networkd_LDADD = \
libudev-internal.la \
@@
-3947,7
+3966,8
@@
test_network_SOURCES = \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-manager.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-manager.c \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
test_network_LDADD = \
libudev-internal.la \
test_network_LDADD = \
libudev-internal.la \
@@
-3960,11
+3980,13
@@
tests += \
test-network
EXTRA_DIST += \
test-network
EXTRA_DIST += \
- src/network/networkd-gperf.gperf \
+ src/network/networkd-network-gperf.gperf \
+ src/network/networkd-netdev-gperf.gperf \
units/systemd-networkd.service.in
CLEANFILES += \
units/systemd-networkd.service.in
CLEANFILES += \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-4245,7
+4267,8
@@
id128_la_LDFLAGS = \
id128_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
id128_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd.la
+ libsystemd.la \
+ libsystemd-shared.la
_daemon_la_SOURCES = \
src/python-systemd/_daemon.c \
_daemon_la_SOURCES = \
src/python-systemd/_daemon.c \
@@
-4266,7
+4289,8
@@
_daemon_la_LDFLAGS = \
_daemon_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
_daemon_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd.la
+ libsystemd.la \
+ libsystemd-shared.la
_reader_la_SOURCES = \
src/python-systemd/_reader.c \
_reader_la_SOURCES = \
src/python-systemd/_reader.c \