chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timesyncd: do not start in virtualized environments
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 53082cf2aba1481c0c39f67cf3e9e1a7159c8670..0213c3846dca0798713bf2b001265714e6d8b05e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-297,10
+297,14
@@
define install-relative-aliases
done
endef
done
endef
+install-touch-usr-hook:
+ touch -c $(DESTDIR)/$(prefix)
+
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
- install-aliases-hook
+ install-aliases-hook \
+ install-touch-usr-hook
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
@@
-460,7
+464,8
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-switch-root.target
+ units/initrd-switch-root.target \
+ units/ldconfig.service
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-508,6
+513,9
@@
dist_userunit_DATA = \
nodist_userunit_DATA = \
units/user/systemd-exit.service
nodist_userunit_DATA = \
units/user/systemd-exit.service
+dist_systempreset_DATA = \
+ system-preset/90-systemd.preset
+
EXTRA_DIST += \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
EXTRA_DIST += \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
@@
-1232,7
+1240,9
@@
tests += \
test-tables \
test-device-nodes \
test-xml \
test-tables \
test-device-nodes \
test-xml \
- test-architecture
+ test-architecture \
+ test-socket-util \
+ test-fdset
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1336,12
+1346,24
@@
test_utf8_SOURCES = \
test_utf8_LDADD = \
libsystemd-shared.la
test_utf8_LDADD = \
libsystemd-shared.la
+test_fdset_SOURCES = \
+ src/test/test-fdset.c
+
+test_fdset_LDADD = \
+ libsystemd-core.la
+
test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
libsystemd-core.la
test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
libsystemd-core.la
+test_socket_util_SOURCES = \
+ src/test/test-socket-util.c
+
+test_socket_util_LDADD = \
+ libsystemd-core.la
+
test_ring_SOURCES = \
src/test/test-ring.c
test_ring_SOURCES = \
src/test/test-ring.c
@@
-1782,7
+1804,7
@@
systemd_sysusers_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
-root
libexec
_PROGRAMS += \
+root
bin
_PROGRAMS += \
systemd-sysusers
nodist_systemunit_DATA += \
systemd-sysusers
nodist_systemunit_DATA += \
@@
-2553,15
+2575,18
@@
libsystemd_network_la_CFLAGS = \
libsystemd_network_la_SOURCES = \
src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
libsystemd_network_la_SOURCES = \
src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
+ src/systemd/sd-dhcp-server.h \
src/systemd/sd-dhcp-lease.h \
src/systemd/sd-ipv4ll.h \
src/network/sd-network.c \
src/network/network-util.h \
src/libsystemd-network/sd-dhcp-client.c \
src/systemd/sd-dhcp-lease.h \
src/systemd/sd-ipv4ll.h \
src/network/sd-network.c \
src/network/network-util.h \
src/libsystemd-network/sd-dhcp-client.c \
+ src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/dhcp-option.c \
src/libsystemd-network/dhcp-packet.c \
src/libsystemd-network/dhcp-internal.h \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/dhcp-option.c \
src/libsystemd-network/dhcp-packet.c \
src/libsystemd-network/dhcp-internal.h \
+ src/libsystemd-network/dhcp-server-internal.h \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
src/libsystemd-network/sd-dhcp-lease.c \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
src/libsystemd-network/sd-dhcp-lease.c \
@@
-2601,6
+2626,14
@@
test_dhcp_client_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
+test_dhcp_server_SOURCES = \
+ src/libsystemd-network/test-dhcp-server.c
+
+test_dhcp_server_LDADD = \
+ libsystemd-network.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
test_ipv4ll_SOURCES = \
src/systemd/sd-ipv4ll.h \
src/libsystemd-network/ipv4ll-internal.h \
test_ipv4ll_SOURCES = \
src/systemd/sd-ipv4ll.h \
src/libsystemd-network/ipv4ll-internal.h \
@@
-2615,6
+2648,7
@@
test_ipv4ll_LDADD = \
tests += \
test-dhcp-option \
test-dhcp-client \
tests += \
test-dhcp-option \
test-dhcp-client \
+ test-dhcp-server \
test-ipv4ll
# ------------------------------------------------------------------------------
test-ipv4ll
# ------------------------------------------------------------------------------
@@
-4345,6
+4379,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev.c \
src/network/networkd-tunnel.c \
src/network/networkd-veth.c \
src/network/networkd-netdev.c \
src/network/networkd-tunnel.c \
src/network/networkd-veth.c \
+ src/network/networkd-vxlan.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 \
@@
-5130,7
+5165,8
@@
endif
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \
- systemd-update-done.service
+ systemd-update-done.service \
+ ldconfig.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \