Merge branch 'lukeshu/postmove' into lukeshu/master

33 files changed, 40 insertions, 0 deletions

diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
index 20bd4f069c..8285554005 100644
--- a/src/grp-system/systemctl/Makefile
+++ b/src/grp-system/systemctl/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbit_PROGRAMS += systemctl
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index 2e6d9bbf7f..a36e925347 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd
 systemd_SOURCES = \
 	src/core/main.c
 
diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile
index 683fb8aa16..9aab0fab15 100644
--- a/src/systemd-ac-power/Makefile
+++ b/src/systemd-ac-power/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-ac-power
 systemd_ac_power_SOURCES = \
 	src/ac-power/ac-power.c
 
diff --git a/src/systemd-analyze/Makefile b/src/systemd-analyze/Makefile
index c8a3d805fd..2e4e7c0bb1 100644
--- a/src/systemd-analyze/Makefile
+++ b/src/systemd-analyze/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-analyze
 systemd_analyze_SOURCES = \
 	src/analyze/analyze.c \
 	src/analyze/analyze-verify.c \
diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile
index 11f3c8038a..2a62917488 100644
--- a/src/systemd-ask-password/Makefile
+++ b/src/systemd-ask-password/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbit_PROGRAMS += systemd-ask-password
 systemd_ask_password_SOURCES = \
 	src/ask-password/ask-password.c
 
diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile
index 72f43638b1..40a7811632 100644
--- a/src/systemd-cgls/Makefile
+++ b/src/systemd-cgls/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-cgls
 systemd_cgls_SOURCES = \
 	src/cgls/cgls.c
 
diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile
index 5c7d9d03ab..a906ed3ce3 100644
--- a/src/systemd-cgroups-agent/Makefile
+++ b/src/systemd-cgroups-agent/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-cgroups-agent
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent/cgroups-agent.c
 
diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile
index 5e379895a8..4980eed15b 100644
--- a/src/systemd-cgtop/Makefile
+++ b/src/systemd-cgtop/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-cgtop
 systemd_cgtop_SOURCES = \
 	src/cgtop/cgtop.c
 
diff --git a/src/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile
index 79684a8a7a..bba46c2905 100644
--- a/src/systemd-debug-generator/Makefile
+++ b/src/systemd-debug-generator/Makefile
@@ -23,6 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+systemgenerator_PROGRAMS += systemd-debug-generator
+
 systemd_debug_generator_SOURCES = \
 	src/debug-generator/debug-generator.c
 
diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile
index b9124f86ea..62c18cd8d4 100644
--- a/src/systemd-delta/Makefile
+++ b/src/systemd-delta/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-delta
 systemd_delta_SOURCES = \
 	src/delta/delta.c
 
diff --git a/src/systemd-detect-virt/Makefile b/src/systemd-detect-virt/Makefile
index 529a3a2561..0ac37341ea 100644
--- a/src/systemd-detect-virt/Makefile
+++ b/src/systemd-detect-virt/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-detect-virt
 systemd_detect_virt_SOURCES = \
 	src/detect-virt/detect-virt.c
 
diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile
index 6589e06525..8886eb50db 100644
--- a/src/systemd-escape/Makefile
+++ b/src/systemd-escape/Makefile
@@ -23,6 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbit_PROGRAMS += systemd-escape
+
 systemd_escape_SOURCES = \
 	src/escape/escape.c
 
diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile
index 9c981837f5..02e2bee141 100644
--- a/src/systemd-fsck/Makefile
+++ b/src/systemd-fsck/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-fsck
 systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
 
diff --git a/src/systemd-fstab-generator/Makefile b/src/systemd-fstab-generator/Makefile
index 4d201612b8..0bfc70e464 100644
--- a/src/systemd-fstab-generator/Makefile
+++ b/src/systemd-fstab-generator/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+systemgenerator_PROGRAMS += systemd-fstab-generator
 systemd_fstab_generator_SOURCES = \
 	src/fstab-generator/fstab-generator.c \
 	src/core/mount-setup.c
diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile
index a070f1c424..14f7d02a86 100644
--- a/src/systemd-getty-generator/Makefile
+++ b/src/systemd-getty-generator/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+systemgenerator_PROGRAMS += systemd-getty-generator
 systemd_getty_generator_SOURCES = \
 	src/getty-generator/getty-generator.c
 
diff --git a/src/initctl/Makefile b/src/systemd-initctl/Makefile
index 21a9ee9e1d..66f3e72aa5 100644
--- a/src/initctl/Makefile
+++ b/src/systemd-initctl/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-initctl
 systemd_initctl_SOURCES = \
 	src/initctl/initctl.c
 
diff --git a/src/initctl/initctl.c b/src/systemd-initctl/initctl.c
index 05285e3846..05285e3846 100644
--- a/src/initctl/initctl.c
+++ b/src/systemd-initctl/initctl.c
diff --git a/src/systemd-machine-id-setup/Makefile b/src/systemd-machine-id-setup/Makefile
index 125471d17a..ad1c4f66e2 100644
--- a/src/systemd-machine-id-setup/Makefile
+++ b/src/systemd-machine-id-setup/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbit_PROGRAMS += systemd-machine-id-setup
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
 	src/core/machine-id-setup.c \
diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile
index c5402385b9..90894e5df5 100644
--- a/src/systemd-notify/Makefile
+++ b/src/systemd-notify/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbit_PROGRAMS += systemd-notify
 systemd_notify_SOURCES = \
 	src/notify/notify.c
 
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 48ebd739ed..460a491a3a 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-nspawn
 systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn.c \
 	src/nspawn/nspawn-settings.c \
diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile
index 19eb6bd10a..eb609cb1b9 100644
--- a/src/systemd-path/Makefile
+++ b/src/systemd-path/Makefile
@@ -23,6 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-path
+
 systemd_path_SOURCES = \
 	src/path/path.c
 
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
index 91baa27bf1..cd294f8d93 100644
--- a/src/systemd-remount-fs/Makefile
+++ b/src/systemd-remount-fs/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-remount-fs
 systemd_remount_fs_SOURCES = \
 	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index 30283141aa..ed4b22a193 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-reply-password
 systemd_reply_password_SOURCES = \
 	src/reply-password/reply-password.c
 
diff --git a/src/systemd-run/Makefile b/src/systemd-run/Makefile
index afa2d0f34c..a8edcf66c1 100644
--- a/src/systemd-run/Makefile
+++ b/src/systemd-run/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-run
 systemd_run_SOURCES = \
 	src/run/run.c
 
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index 0695f3927d..99c716439f 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-shutdown
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
diff --git a/src/systemd-sleep/Makefile b/src/systemd-sleep/Makefile
index 2d8854bbf9..348874c6ba 100644
--- a/src/systemd-sleep/Makefile
+++ b/src/systemd-sleep/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-sleep
 systemd_sleep_SOURCES = \
 	src/sleep/sleep.c
 
diff --git a/src/systemd-socket-proxyd/Makefile b/src/systemd-socket-proxyd/Makefile
index cead4f37a9..07cc307abe 100644
--- a/src/systemd-socket-proxyd/Makefile
+++ b/src/systemd-socket-proxyd/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-socket-proxyd
 
 systemd_socket_proxyd_SOURCES = \
 	src/socket-proxy/socket-proxyd.c
diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile
index dd6d433fc6..8aeb20b41a 100644
--- a/src/systemd-stdio-bridge/Makefile
+++ b/src/systemd-stdio-bridge/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+bin_PROGRAMS += systemd-stdio-bridge
 systemd_stdio_bridge_SOURCES = \
 	src/stdio-bridge/stdio-bridge.c
 
diff --git a/src/systemd-sysctl/Makefile b/src/systemd-sysctl/Makefile
index 31d38d9104..cad10ab8c2 100644
--- a/src/systemd-sysctl/Makefile
+++ b/src/systemd-sysctl/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-sysctl
 systemd_sysctl_SOURCES = \
 	src/sysctl/sysctl.c
 
diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile
index 62f750c182..fd44aef359 100644
--- a/src/systemd-system-update-generator/Makefile
+++ b/src/systemd-system-update-generator/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+systemgenerator_PROGRAMS += systemd-system-update-generator
 systemd_system_update_generator_SOURCES = \
 	src/system-update-generator/system-update-generator.c
 
diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile
index 37b51da33b..d71f124472 100644
--- a/src/systemd-tty-ask-password-agent/Makefile
+++ b/src/systemd-tty-ask-password-agent/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbit_PROGRAMS += systemd-tty-ask-password-agent
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent/tty-ask-password-agent.c
 
diff --git a/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile
index ae592db650..7b6c3bc2a5 100644
--- a/src/systemd-update-done/Makefile
+++ b/src/systemd-update-done/Makefile
@@ -23,6 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+libexec_PROGRAMS += systemd-update-done
+
 systemd_update_done_SOURCES = \
 	src/update-done/update-done.c
 
diff --git a/src/systemd-update-utmp/Makefile b/src/systemd-update-utmp/Makefile
index 182c7534e7..c9c5f5eab2 100644
--- a/src/systemd-update-utmp/Makefile
+++ b/src/systemd-update-utmp/Makefile
@@ -23,6 +23,11 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+ifneq ($(HAVE_UTMP),)
+libexec_PROGRAMS += \
+	systemd-update-utmp
+endif # HAVE_UTMP
+
 systemd_update_utmp_SOURCES = \
 	src/update-utmp/update-utmp.c