summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am19
1 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index e97d5bd78f..f2ef83b0c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -747,8 +747,6 @@ libbasic_la_SOURCES = \
src/basic/missing_syscall.h \
src/basic/capability-util.c \
src/basic/capability-util.h \
- src/basic/c-rbtree.c \
- src/basic/c-rbtree.h \
src/basic/conf-files.c \
src/basic/conf-files.h \
src/basic/stdio-util.h \
@@ -1038,7 +1036,9 @@ libshared_la_SOURCES = \
src/shared/machine-pool.c \
src/shared/machine-pool.h \
src/shared/resolve-util.c \
- src/shared/resolve-util.h
+ src/shared/resolve-util.h \
+ src/shared/tests.h \
+ src/shared/tests.c
if HAVE_UTMP
libshared_la_SOURCES += \
@@ -1494,7 +1494,6 @@ tests += \
test-copy \
test-cap-list \
test-sigbus \
- test-rbtree \
test-verbs \
test-af-list \
test-arphrd-list \
@@ -1748,12 +1747,6 @@ test_sigbus_SOURCES = \
test_sigbus_LDADD = \
libshared.la
-test_rbtree_SOURCES = \
- src/test/test-rbtree.c
-
-test_rbtree_LDADD = \
- libshared.la
-
test_condition_SOURCES = \
src/test/test-condition.c
@@ -3028,7 +3021,9 @@ systemd_nspawn_SOURCES = \
src/core/mount-setup.c \
src/core/mount-setup.h \
src/core/loopback-setup.c \
- src/core/loopback-setup.h
+ src/core/loopback-setup.h \
+ src/core/machine-id-setup.c \
+ src/core/machine-id-setup.h
nodist_systemd_nspawn_SOURCES = \
src/nspawn/nspawn-gperf.c
@@ -4728,7 +4723,7 @@ systemd_localed_SOURCES = \
systemd_localed_LDADD = \
libshared.la \
- $(XKBCOMMON_LIBS)
+ -ldl
systemd_localed_CFLAGS = \
$(AM_CFLAGS) \