Add a bit more explicit message, to help confused users

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b69d66da1843b828d543dcd68bf765d352991142..92de1630b4d81b15d8ea2dadba23689ea5ca58fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,7 +159,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
-       -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+       -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
@@ -642,6 +642,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/list.h \
        src/shared/macro.h \
        src/shared/def.h \
+       src/shared/device-nodes.c \
+       src/shared/device-nodes.h \
        src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
@@ -715,6 +717,10 @@ libsystemd_shared_la_SOURCES = \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \
        src/shared/MurmurHash3.h \
+       src/shared/acpi-fpdt.h \
+       src/shared/acpi-fpdt.c \
+       src/shared/boot-timestamps.h \
+       src/shared/boot-timestamps.c \
        src/shared/refcnt.h
 
 #-------------------------------------------------------------------------------
@@ -1123,6 +1129,7 @@ tests += \
        test-strxcpyx \
        test-unit-name \
        test-unit-file \
+       test-utf8 \
        test-util \
        test-date \
        test-sleep \
@@ -1136,7 +1143,8 @@ tests += \
        test-time \
        test-hashmap \
        test-list \
-       test-tables
+       test-tables \
+       test-device-nodes
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1148,6 +1156,12 @@ EXTRA_DIST += \
 EXTRA_DIST += \
        src/test/test-helper.h
 
+test_device_nodes_SOURCES = \
+       src/test/test-device-nodes.c
+
+test_device_nodes_LDADD = \
+       libsystemd-shared.la
+
 test_engine_SOURCES = \
        src/test/test-engine.c
 
@@ -1196,12 +1210,12 @@ test_hostname_LDADD = \
 
 if ENABLE_EFI
 manual_tests += \
-       test-efivars
+       test-boot-timestamp
 
-test_efivars_SOURCES = \
-       src/test/test-efivars.c
+test_boot_timestamp_SOURCES = \
+       src/test/test-boot-timestamps.c
 
-test_efivars_LDADD = \
+test_boot_timestamp_LDADD = \
        libsystemd-shared.la
 endif
 
@@ -1225,6 +1239,15 @@ test_unit_file_CFLAGS = \
 test_unit_file_LDADD = \
        libsystemd-core.la
 
+test_utf8_SOURCES = \
+       src/test/test-utf8.c
+
+test_utf8_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_utf8_LDADD = \
+       libsystemd-shared.la
+
 test_util_SOURCES = \
        src/test/test-util.c
 
@@ -1542,12 +1565,15 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-       src/tmpfiles/tmpfiles.c
+       src/tmpfiles/tmpfiles.c \
+       src/shared/specifier.c \
+       src/shared/specifier.h
 
 systemd_tmpfiles_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
-       libsystemd-capability.la
+       libsystemd-capability.la \
+       libsystemd-id128-internal.la
 
 rootbin_PROGRAMS += \
        systemd-tmpfiles
@@ -3735,15 +3761,8 @@ systemd_logind_LDADD = \
        libsystemd-logind-core.la \
        $(libsystemd_logind_core_la_LIBADD)
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-       src/login/logind-acl.c
-
-systemd_logind_LDADD += \
-       libsystemd-acl.la
-endif
-
 libsystemd_logind_core_la_SOURCES = \
+       src/login/logind-core.c \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
@@ -3755,6 +3774,8 @@ libsystemd_logind_core_la_SOURCES = \
        src/login/logind-seat.h \
        src/login/logind-session.c \
        src/login/logind-session.h \
+       src/login/logind-session-device.c \
+       src/login/logind-session-device.h \
        src/login/logind-user.c \
        src/login/logind-user.h \
        src/login/logind-inhibit.c \
@@ -3779,6 +3800,14 @@ libsystemd_logind_core_la_LIBADD = \
        libsystemd-id128-internal.la \
        libudev.la
 
+if HAVE_ACL
+libsystemd_logind_core_la_SOURCES += \
+       src/login/logind-acl.c
+
+libsystemd_logind_core_la_LIBADD += \
+       libsystemd-acl.la
+endif
+
 noinst_LTLIBRARIES += \
        libsystemd-logind-core.la
 
@@ -4198,7 +4227,7 @@ substitutions = \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
-       '|RANDOM_SEED=$(localstatedir)/lib/random-seed|' \
+       '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
        '|libdir=$(libdir)|' \