X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e428141da245b175e3abe75d215a0ccb45a5e8e6;hb=fe582db94bac3743b87d67d880497fe40b06dd2f;hp=8fd933be5178b1b9b1a5a99d33b82b76f5a8ae19;hpb=8ea48dfcd33e8db0c01bf8c57c3bbcfdc3c86d4b;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 8fd933be5..e428141da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -297,10 +297,14 @@ define install-relative-aliases done endef +install-touch-usr-hook: + touch -c $(DESTDIR)/$(prefix) + 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)) @@ -460,7 +464,8 @@ dist_systemunit_DATA = \ 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 \ @@ -491,6 +496,7 @@ nodist_systemunit_DATA = \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service \ units/debug-shell.service \ units/initrd-parse-etc.service \ units/initrd-cleanup.service \ @@ -507,6 +513,9 @@ dist_userunit_DATA = \ 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 \ @@ -1231,7 +1240,9 @@ tests += \ test-tables \ test-device-nodes \ test-xml \ - test-architecture + test-architecture \ + test-socket-util \ + test-fdset EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1335,12 +1346,24 @@ test_utf8_SOURCES = \ 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_socket_util_SOURCES = \ + src/test/test-socket-util.c + +test_socket_util_LDADD = \ + libsystemd-core.la + test_ring_SOURCES = \ src/test/test-ring.c @@ -1741,7 +1764,8 @@ dist_tmpfiles_DATA = \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf \ - tmpfiles.d/var.conf + tmpfiles.d/var.conf \ + tmpfiles.d/etc.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1780,13 +1804,20 @@ systemd_sysusers_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -rootlibexec_PROGRAMS += \ +rootbin_PROGRAMS += \ systemd-sysusers +nodist_systemunit_DATA += \ + units/systemd-sysusers.service + +SYSINIT_TARGET_WANTS += \ + systemd-sysusers.service + nodist_sysusers_DATA = \ sysusers.d/systemd.conf EXTRA_DIST += \ + units/systemd-sysusers.service.in \ sysusers.d/systemd.conf.in INSTALL_DIRS += \ @@ -2544,15 +2575,18 @@ libsystemd_network_la_CFLAGS = \ 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/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-server-internal.h \ src/libsystemd-network/dhcp-protocol.h \ src/libsystemd-network/dhcp-lease-internal.h \ src/libsystemd-network/sd-dhcp-lease.c \ @@ -2592,6 +2626,14 @@ test_dhcp_client_LDADD = \ 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 \ @@ -2606,6 +2648,7 @@ test_ipv4ll_LDADD = \ tests += \ test-dhcp-option \ test-dhcp-client \ + test-dhcp-server \ test-ipv4ll # ------------------------------------------------------------------------------ @@ -2753,19 +2796,23 @@ CLEANFILES += \ EXTRA_DIST += \ units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ - units/systemd-udev-settle.service.in + units/systemd-udev-settle.service.in \ + units/systemd-udev-hwdb-update.service.in CLEANFILES += \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ - units/systemd-udev-settle.service + units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service SOCKETS_TARGET_WANTS += \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket + SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ - systemd-udev-trigger.service + systemd-udev-trigger.service \ + systemd-udev-hwdb-update.service rootbin_PROGRAMS += \ udevadm @@ -3490,7 +3537,7 @@ libsystemd_journal_internal_la_SOURCES = \ src/journal/mmap-cache.h # using _CFLAGS = in the conditional below would suppress AM_CFLAGS -libsystemd_journal_internal_la_CFLAGS = +libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = @@ -3540,7 +3587,8 @@ dist_systemunit_DATA += \ nodist_systemunit_DATA += \ units/systemd-journald.service \ - units/systemd-journal-flush.service + units/systemd-journal-flush.service \ + units/systemd-journal-catalog-update.service dist_pkgsysconf_DATA += \ src/journal/journald.conf @@ -3557,11 +3605,13 @@ SOCKETS_TARGET_WANTS += \ SYSINIT_TARGET_WANTS += \ systemd-journald.service \ - systemd-journal-flush.service + systemd-journal-flush.service \ + systemd-journal-catalog-update.service EXTRA_DIST += \ units/systemd-journald.service.in \ units/systemd-journal-flush.service.in \ + units/systemd-journal-catalog-update.service.in \ src/journal/journald-gperf.gperf CLEANFILES += \ @@ -4329,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-vxlan.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -5114,7 +5165,8 @@ endif 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 \