summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-aux/Makefile.each.tail/70-sdcompletion.mk20
-rw-r--r--build-aux/Makefile.once.head/20-amcfg.mk2
-rw-r--r--src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles.completion.bash0
-rw-r--r--src/grp-login/systemd-inhibit/systemd-inhibit.completion.bash0
-rw-r--r--src/grp-utils/systemd-notify/systemd-notify.completion.bash0
-rw-r--r--src/systemd-ask-password/systemd-ask-password.completion.bash0
-rw-r--r--src/systemd-machine-id-setup/systemd-machine-id-setup.completion.bash0
-rw-r--r--src/systemd-mount/systemd-mount.completion.bash0
-rw-r--r--src/systemd-tty-ask-password-agent/systemd-tty-ask-password-agent.completion.bash0
9 files changed, 15 insertions, 7 deletions
diff --git a/build-aux/Makefile.each.tail/70-sdcompletion.mk b/build-aux/Makefile.each.tail/70-sdcompletion.mk
index 92c37a235d..98c34568a1 100644
--- a/build-aux/Makefile.each.tail/70-sdcompletion.mk
+++ b/build-aux/Makefile.each.tail/70-sdcompletion.mk
@@ -17,10 +17,18 @@ rootbin_PROGRAMS ?=
bin_PROGRAMS ?=
dist_bin_SCRIPTS ?=
-_bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))
-dist_bashcompletion_DATA += $(filter $(files.src),$(_bashcompletion_DATA))
-nodist_bashcompletion_DATA += $(filter-out $(files.src),$(_bashcompletion_DATA))
+_pf = $(patsubst $1,$2,$(filter $1,$3))
-_zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(notdir $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))))
-dist_zshcompletion_DATA += $(filter $(files.src),$(_zshcompletion_DATA))
-nodist_zshcompletion_DATA += $(filter-out $(files.src),$(_zshcompletion_DATA))
+dist_bashcompletion_DATA ?=
+nodist_bashcompletion_DATA ?=
+_bashcompletion_DATA := $(notdir $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))
+dist_bashcompletion_DATA := $(sort $(dist_bashcompletion_DATA) $(filter $(call _pf,%.completion.bash,%,$(files.src)),$(_bashcompletion_DATA)))
+nodist_bashcompletion_DATA := $(sort $(nodist_bashcompletion_DATA) $(filter-out $(call _pf,%.completion.bash,%,$(files.src)),$(_bashcompletion_DATA)))
+undefine _bashcompletion_DATA
+
+dist_zshcompletion_DATA ?=
+nodist_zshcompletion_DATA ?=
+_zshcompletion_DATA := $(addprefix _,$(notdir $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS)))
+dist_zshcompletion_DATA := $(sort $(dist_zshcompletion_DATA) $(filter $(call _pf,%.completion.zsh,_%,$(files.src)),$(_zshcompletion_DATA)))
+nodist_zshcompletion_DATA := $(sort $(nodist_zshcompletion_DATA) $(filter-out $(call _pf,%.completion.zsh,_%,$(files.src)),$(_zshcompletion_DATA)))
+undefine _zshcompletion_DATA
diff --git a/build-aux/Makefile.once.head/20-amcfg.mk b/build-aux/Makefile.once.head/20-amcfg.mk
index 57d1561204..d72674ac1d 100644
--- a/build-aux/Makefile.once.head/20-amcfg.mk
+++ b/build-aux/Makefile.once.head/20-amcfg.mk
@@ -41,7 +41,7 @@ am.syspat_zshcompletion_DATA = _%
am.outpat_xinitrc_SCRIPTS = %.xinitrc
am.syspat_xinitrc_SCRIPTS = %.sh
-am.outpat_include_HEADERS = $(abspath $(srcdir)/include)/%.h
+am.outpat_include_HEADERS = include/%.h
am.syspat_include_HEADERS = %.h
V ?=
diff --git a/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles.completion.bash b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles.completion.bash
diff --git a/src/grp-login/systemd-inhibit/systemd-inhibit.completion.bash b/src/grp-login/systemd-inhibit/systemd-inhibit.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/grp-login/systemd-inhibit/systemd-inhibit.completion.bash
diff --git a/src/grp-utils/systemd-notify/systemd-notify.completion.bash b/src/grp-utils/systemd-notify/systemd-notify.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/grp-utils/systemd-notify/systemd-notify.completion.bash
diff --git a/src/systemd-ask-password/systemd-ask-password.completion.bash b/src/systemd-ask-password/systemd-ask-password.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/systemd-ask-password/systemd-ask-password.completion.bash
diff --git a/src/systemd-machine-id-setup/systemd-machine-id-setup.completion.bash b/src/systemd-machine-id-setup/systemd-machine-id-setup.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/systemd-machine-id-setup/systemd-machine-id-setup.completion.bash
diff --git a/src/systemd-mount/systemd-mount.completion.bash b/src/systemd-mount/systemd-mount.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/systemd-mount/systemd-mount.completion.bash
diff --git a/src/systemd-tty-ask-password-agent/systemd-tty-ask-password-agent.completion.bash b/src/systemd-tty-ask-password-agent/systemd-tty-ask-password-agent.completion.bash
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/systemd-tty-ask-password-agent/systemd-tty-ask-password-agent.completion.bash