X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=92de1630b4d81b15d8ea2dadba23689ea5ca58fb;hp=89a5c863577af1ff8e4edc75e08842df7991e5e5;hb=edcfd89ad0996686488c02ee0062d913fa0ba483;hpb=8f6ce71fe79d897b67157d92869db87ee2042af6 diff --git a/Makefile.am b/Makefile.am index 89a5c8635..92de1630b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -717,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 #------------------------------------------------------------------------------- @@ -1155,9 +1159,6 @@ EXTRA_DIST += \ test_device_nodes_SOURCES = \ src/test/test-device-nodes.c -test_device_nodes_CFLAGS = \ - $(AM_CFLAGS) - test_device_nodes_LDADD = \ libsystemd-shared.la @@ -1209,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 @@ -3760,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 \ @@ -3806,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