chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 86a8f0b7bc45757b9ed21b178c52f349dbd96306..a2a01d073799de3803737cb81901ad3cc72a6432 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-36,7
+36,7
@@
SUBDIRS = . po
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=5
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=
0
+LIBUDEV_REVISION=
1
LIBUDEV_AGE=4
LIBGUDEV_CURRENT=2
LIBUDEV_AGE=4
LIBGUDEV_CURRENT=2
@@
-59,9
+59,9
@@
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_CURRENT=
1
+LIBSYSTEMD_CURRENT=
2
LIBSYSTEMD_REVISION=0
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=
1
+LIBSYSTEMD_AGE=
2
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-758,8
+758,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/replace-var.h \
src/shared/spawn-polkit-agent.c \
src/shared/spawn-polkit-agent.h \
src/shared/replace-var.h \
src/shared/spawn-polkit-agent.c \
src/shared/spawn-polkit-agent.h \
- src/shared/
hwclock
.c \
- src/shared/
hwclock
.h \
+ src/shared/
clock-util
.c \
+ src/shared/
clock-util
.h \
src/shared/time-dst.c \
src/shared/time-dst.h \
src/shared/calendarspec.c \
src/shared/time-dst.c \
src/shared/time-dst.h \
src/shared/calendarspec.c \
@@
-805,7
+805,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/ring.c \
src/shared/ring.h \
src/shared/async.c \
src/shared/ring.c \
src/shared/ring.h \
src/shared/async.c \
- src/shared/async.h
+ src/shared/async.h \
+ src/shared/eventfd-util.c \
+ src/shared/eventfd-util.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1796,9
+1798,6
@@
systemd_detect_virt_SOURCES = \
systemd_detect_virt_LDADD = \
libsystemd-shared.la
systemd_detect_virt_LDADD = \
libsystemd-shared.la
-systemd-detect-virt-install-hook:
- -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
-
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
@@
-2034,6
+2033,7
@@
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c
systemd_bus_proxyd_LDADD = \
src/bus-proxyd/bus-proxyd.c
systemd_bus_proxyd_LDADD = \
+ libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
@@
-2509,6
+2509,7
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/network-internal.h
libsystemd_network_la_LIBADD = \
src/libsystemd-network/network-internal.h
libsystemd_network_la_LIBADD = \
+ libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
@@
-2532,7
+2533,6
@@
test_dhcp_client_SOURCES = \
test_dhcp_client_LDADD = \
libsystemd-network.la \
test_dhcp_client_LDADD = \
libsystemd-network.la \
- libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@
-3480,7
+3480,8
@@
bin_PROGRAMS += \
systemd-cat
dist_systemunit_DATA += \
systemd-cat
dist_systemunit_DATA += \
- units/systemd-journald.socket
+ units/systemd-journald.socket \
+ units/systemd-journald-dev-log.socket
nodist_systemunit_DATA += \
units/systemd-journald.service \
nodist_systemunit_DATA += \
units/systemd-journald.service \
@@
-3496,7
+3497,9
@@
dist_catalog_DATA = \
catalog/systemd.catalog
SOCKETS_TARGET_WANTS += \
catalog/systemd.catalog
SOCKETS_TARGET_WANTS += \
- systemd-journald.socket
+ systemd-journald.socket \
+ systemd-journald-dev-log.socket
+
SYSINIT_TARGET_WANTS += \
systemd-journald.service \
systemd-journal-flush.service
SYSINIT_TARGET_WANTS += \
systemd-journald.service \
systemd-journal-flush.service
@@
-3564,7
+3567,8
@@
systemd_socket_proxyd_LDADD = \
libsystemd-logs.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
libsystemd-logs.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-resolve.la
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
@@
-4066,7
+4070,6
@@
CLEANFILES += \
systemd_timesyncd_LDADD = \
libsystemd-resolve.la \
libsystemd-network.la \
systemd_timesyncd_LDADD = \
libsystemd-resolve.la \
libsystemd-network.la \
- libudev-internal.la \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
@@
-4217,8
+4220,8
@@
CLEANFILES += \
src/resolve/resolved-gperf.c
systemd_resolved_LDADD = \
src/resolve/resolved-gperf.c
systemd_resolved_LDADD = \
+ libsystemd-capability.la \
libsystemd-network.la \
libsystemd-network.la \
- libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@
-4256,14
+4259,13
@@
systemd_networkd_SOURCES = \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la \
- $(KMOD_LIBS)
+ libsystemd-capability.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
libsystemd_networkd_core_la_CFLAGS = \
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
libsystemd_networkd_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(KMOD_CFLAGS)
+ $(AM_CFLAGS)
libsystemd_networkd_core_la_SOURCES = \
src/libsystemd-network/network-internal.h \
libsystemd_networkd_core_la_SOURCES = \
src/libsystemd-network/network-internal.h \
@@
-4271,6
+4273,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-link.c \
src/network/networkd-netdev.c \
src/network/networkd-tunnel.c \
src/network/networkd-link.c \
src/network/networkd-netdev.c \
src/network/networkd-tunnel.c \
+ src/network/networkd-veth.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
@@
-4291,8
+4294,7
@@
rootlibexec_PROGRAMS += \
systemd-networkd-wait-online
systemd_networkd_wait_online_CFLAGS = \
systemd-networkd-wait-online
systemd_networkd_wait_online_CFLAGS = \
- $(AM_CFLAGS) \
- $(KMOD_CFLAGS)
+ $(AM_CFLAGS)
systemd_networkd_wait_online_SOURCES = \
src/libsystemd-network/network-internal.h \
systemd_networkd_wait_online_SOURCES = \
src/libsystemd-network/network-internal.h \
@@
-4309,12
+4311,10
@@
test_network_SOURCES = \
src/network/test-network.c
test_network_CFLAGS = \
src/network/test-network.c
test_network_CFLAGS = \
- $(AM_CFLAGS) \
- $(KMOD_CFLAGS)
+ $(AM_CFLAGS)
test_network_LDADD = \
libsystemd-networkd-core.la
test_network_LDADD = \
libsystemd-networkd-core.la
- $(KMOD_LIBS)
tests += \
test-network
tests += \
test-network