chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: don't free fds array twice
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 9b06c28833c6647f9b56f678777bf6761a4cbdf9..af4e215538c92f0ba9bbd1450d2a5f3f80fb9a00 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)\" \
-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)\" \
-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/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 \
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/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
#-------------------------------------------------------------------------------
src/shared/refcnt.h
#-------------------------------------------------------------------------------
@@
-1137,7
+1143,8
@@
tests += \
test-time \
test-hashmap \
test-list \
test-time \
test-hashmap \
test-list \
- test-tables
+ test-tables \
+ test-device-nodes
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1149,6
+1156,12
@@
EXTRA_DIST += \
EXTRA_DIST += \
src/test/test-helper.h
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
test_engine_SOURCES = \
src/test/test-engine.c
@@
-1197,12
+1210,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
@@
-3748,15
+3761,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 \
@@
-3794,6
+3800,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
@@
-3905,6
+3919,7
@@
libsystemd_login_la_LDFLAGS = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la \
libsystemd-daemon-internal.la \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la \
libsystemd-daemon-internal.la \
+ libsystemd-label.la \
$(RT_LIBS)
libsystemd_login_internal_la_SOURCES = \
$(RT_LIBS)
libsystemd_login_internal_la_SOURCES = \
@@
-4213,7
+4228,7
@@
substitutions = \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
'|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)|' \
'|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \
'|libdir=$(libdir)|' \