X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=425a5e16a6bcacbf0b36dec0940357cd10c27232;hb=47efffc22badb20124dca5ed8c3b52911d71fc31;hp=321379ca5fa7994d510968c0a0b1d052b3b5488e;hpb=418b9be50018303cde79b423d4701b7fd86ddbdc;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 321379ca5..425a5e16a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,6 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
-ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -337,7 +336,8 @@ rootbin_PROGRAMS = \
 	systemd-notify \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
-	systemd-machine-id-setup
+	systemd-machine-id-setup \
+	systemd-escape
 
 bin_PROGRAMS = \
 	systemd-cgls \
@@ -1894,15 +1894,8 @@ nodist_systemunit_DATA += \
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
 
-systemgenerator_PROGRAMS += \
-	systemd-firstboot-generator
-
-systemd_firstboot_generator_SOURCES = \
-	src/firstboot/firstboot-generator.c
-
-systemd_firstboot_generator_LDADD = \
-	libsystemd-label.la \
-	libsystemd-shared.la
+SYSINIT_TARGET_WANTS += \
+	systemd-firstboot.service
 
 endif
 
@@ -2115,6 +2108,13 @@ systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+	src/escape/escape.c
+
+systemd_escape_LDADD = \
+	libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
@@ -4319,10 +4319,6 @@ dist_systemunit_DATA += \
 polkitpolicy_files += \
 	src/timedate/org.freedesktop.timedate1.policy
 
-INSTALL_DIRS += \
-	$(prefix)/lib/systemd/ntp-units.d \
-	$(sysconfdir)/systemd/ntp-units.d
-
 SYSTEM_UNIT_ALIASES += \
 	systemd-timedated.service dbus-org.freedesktop.timedate1.service
 
@@ -4396,18 +4392,14 @@ EXTRA_DIST += \
 
 CLEANFILES += \
 	src/timesync/timesyncd.conf
-
-dist_ntpunits_DATA = \
-	src/timesync/90-systemd.list
-
 endif
 
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/nss-myhostname.c \
-	src/nss-myhostname/ifconf.h \
-	src/nss-myhostname/netlink.c
+	src/nss-myhostname/addresses.h \
+	src/nss-myhostname/addresses.c
 
 libnss_myhostname_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -4582,6 +4574,7 @@ libsystemd_networkd_core_la_SOURCES = \
 	src/network/networkd-macvlan.c \
 	src/network/networkd-dummy.c \
 	src/network/networkd-tuntap.c \
+	src/network/networkd-bond.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \