chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: don't access potentially NULL string arrays
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 89a5c863577af1ff8e4edc75e08842df7991e5e5..8d9c58758f46c9f379ed5a390c30a3d1e38a1a85 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-34,16
+34,16
@@
SUBDIRS = . po
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
-LIBUDEV_CURRENT=
4
-LIBUDEV_REVISION=
8
-LIBUDEV_AGE=
3
+LIBUDEV_CURRENT=
5
+LIBUDEV_REVISION=
0
+LIBUDEV_AGE=
4
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=9
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_REVISION=
1
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
@@
-51,11
+51,11
@@
LIBSYSTEMD_DAEMON_REVISION=10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
5
+LIBSYSTEMD_ID128_REVISION=2
6
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=
2
+LIBSYSTEMD_JOURNAL_REVISION=
3
LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
@@
-717,7
+717,13
@@
libsystemd_shared_la_SOURCES = \
src/shared/output-mode.h \
src/shared/MurmurHash3.c \
src/shared/MurmurHash3.h \
src/shared/output-mode.h \
src/shared/MurmurHash3.c \
src/shared/MurmurHash3.h \
- src/shared/refcnt.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 \
+ src/shared/mkdir.c \
+ src/shared/mkdir.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-761,15
+767,12
@@
noinst_LTLIBRARIES += \
libsystemd-label.la
libsystemd_label_la_SOURCES = \
libsystemd-label.la
libsystemd_label_la_SOURCES = \
- src/shared/cgroup-label.c \
src/shared/socket-label.c \
src/shared/label.c \
src/shared/label.h \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
src/shared/socket-label.c \
src/shared/label.c \
src/shared/label.h \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
- src/shared/mkdir.c \
src/shared/mkdir-label.c \
src/shared/mkdir-label.c \
- src/shared/mkdir.h \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
src/shared/fileio-label.c \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
src/shared/fileio-label.c \
@@
-1155,9
+1158,6
@@
EXTRA_DIST += \
test_device_nodes_SOURCES = \
src/test/test-device-nodes.c
test_device_nodes_SOURCES = \
src/test/test-device-nodes.c
-test_device_nodes_CFLAGS = \
- $(AM_CFLAGS)
-
test_device_nodes_LDADD = \
libsystemd-shared.la
test_device_nodes_LDADD = \
libsystemd-shared.la
@@
-1209,12
+1209,12
@@
test_hostname_LDADD = \
if ENABLE_EFI
manual_tests += \
if ENABLE_EFI
manual_tests += \
- test-
efivars
+ test-
boot-timestamp
-test_
efivars
_SOURCES = \
- src/test/test-
efivar
s.c
+test_
boot_timestamp
_SOURCES = \
+ src/test/test-
boot-timestamp
s.c
-test_
efivars
_LDADD = \
+test_
boot_timestamp
_LDADD = \
libsystemd-shared.la
endif
libsystemd-shared.la
endif
@@
-3760,15
+3760,8
@@
systemd_logind_LDADD = \
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
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 = \
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 \
src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-device.h \
@@
-3806,6
+3799,14
@@
libsystemd_logind_core_la_LIBADD = \
libsystemd-id128-internal.la \
libudev.la
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
noinst_LTLIBRARIES += \
libsystemd-logind-core.la