chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: ignore non-manpage files when generating makefile
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ac90c1890cdb712dd5a2bfe743fa5f07d7ed52c0..6f8d3b5a29be4d05416ac811367d32c046e618c1 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 \
@@
-1018,6
+1020,7
@@
libsystemd_core_la_CFLAGS = \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
+ $(APPARMOR_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
$(SECCOMP_CFLAGS) \
-pthread
@@
-1033,6
+1036,7
@@
libsystemd_core_la_LIBADD = \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
$(KMOD_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
$(KMOD_LIBS) \
+ $(APPARMOR_LIBS) \
$(SECCOMP_LIBS)
if HAVE_SECCOMP
$(SECCOMP_LIBS)
if HAVE_SECCOMP
@@
-1150,7
+1154,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 \
@@
-1298,6
+1303,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
@@
-1873,9
+1884,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 = \