From ac6a37c8631f36c13e48d638e6a6785557496f26 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 21 May 2014 14:29:42 +0200 Subject: build-sys: cleanup bash-completion/ Signed-off-by: Karel Zak --- Makefile.am | 1 + bash-completion/Makemodule.am | 324 ++++++++++++++++++++++-------------------- 2 files changed, 171 insertions(+), 154 deletions(-) diff --git a/Makefile.am b/Makefile.am index a20e65da3..7d0176547 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,7 @@ bin_PROGRAMS = sbin_PROGRAMS = dist_usrbin_exec_SCRIPTS = systemdsystemunit_DATA = +dist_bashcompletion_DATA = check_PROGRAMS = TESTS = diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am index 1622894ec..8d6431ba4 100644 --- a/bash-completion/Makemodule.am +++ b/bash-completion/Makemodule.am @@ -1,51 +1,111 @@ if BUILD_BASH_COMPLETION -dist_bashcompletion_DATA = \ - bash-completion/blkid \ - bash-completion/cal \ - bash-completion/col \ - bash-completion/colcrt \ - bash-completion/colrm \ - bash-completion/column \ - bash-completion/findmnt \ - bash-completion/flock \ - bash-completion/fsck.minix \ - bash-completion/getopt \ - bash-completion/hexdump \ - bash-completion/ipcrm \ - bash-completion/ipcs \ - bash-completion/isosize \ - bash-completion/logger \ - bash-completion/look \ - bash-completion/mcookie \ - bash-completion/mkfs \ - bash-completion/mkfs.minix \ - bash-completion/mkswap \ - bash-completion/namei \ - bash-completion/prlimit \ - bash-completion/readprofile \ - bash-completion/renice \ - bash-completion/rev \ - bash-completion/script \ - bash-completion/scriptreplay \ - bash-completion/setsid \ - bash-completion/tailf \ - bash-completion/whereis \ - bash-completion/wipefs -# disk-utils... +if BUILD_BLKID +dist_bashcompletion_DATA += bash-completion/blkid +endif +if BUILD_CAL +dist_bashcompletion_DATA += bash-completion/cal +endif +if BUILD_COL +dist_bashcompletion_DATA += bash-completion/col +endif +if BUILD_COLCRT +dist_bashcompletion_DATA += bash-completion/colcrt +endif +if BUILD_COLRM +dist_bashcompletion_DATA += bash-completion/colrm +endif +if BUILD_COLUMN +dist_bashcompletion_DATA += bash-completion/column +endif +if BUILD_FINDMNT +dist_bashcompletion_DATA += bash-completion/findmnt +endif +if BUILD_FLOCK +dist_bashcompletion_DATA += bash-completion/flock +endif +if BUILD_GETOPT +dist_bashcompletion_DATA += bash-completion/getopt +endif +if BUILD_HEXDUMP +dist_bashcompletion_DATA += bash-completion/hexdump +endif +if BUILD_IPCRM +dist_bashcompletion_DATA += bash-completion/ipcrm +endif +if BUILD_IPCS +dist_bashcompletion_DATA += bash-completion/ipcs +endif +if BUILD_ISOSIZE +dist_bashcompletion_DATA += bash-completion/isosize +endif +if BUILD_LOGGER +dist_bashcompletion_DATA += bash-completion/logger +endif +if BUILD_LOOK +dist_bashcompletion_DATA += bash-completion/look +endif +if BUILD_MCOOKIE +dist_bashcompletion_DATA += bash-completion/mcookie +endif +if BUILD_MKFS +dist_bashcompletion_DATA += bash-completion/mkfs +endif +if BUILD_MKSWAP +dist_bashcompletion_DATA += bash-completion/mkswap +endif +if BUILD_NAMEI +dist_bashcompletion_DATA += bash-completion/namei +endif +if BUILD_PRLIMIT +dist_bashcompletion_DATA += bash-completion/prlimit +endif +if BUILD_READPROFILE +dist_bashcompletion_DATA += bash-completion/readprofile +endif +if BUILD_RENICE +dist_bashcompletion_DATA += bash-completion/renice +endif +if BUILD_REV +dist_bashcompletion_DATA += bash-completion/rev +endif +if BUILD_SCRIPT +dist_bashcompletion_DATA += bash-completion/script +endif +if BUILD_SCRIPTREPLAY +dist_bashcompletion_DATA += bash-completion/scriptreplay +endif +if BUILD_SETSID +dist_bashcompletion_DATA += bash-completion/setsid +endif +if BUILD_TAILF +dist_bashcompletion_DATA += bash-completion/tailf +endif +if BUILD_WHEREIS +dist_bashcompletion_DATA += bash-completion/whereis +endif +if BUILD_WIPEFS +dist_bashcompletion_DATA += bash-completion/wipefs +endif +if BUILD_FSCK +dist_bashcompletion_DATA += bash-completion/fsck +endif + if BUILD_BFS +dist_bashcompletion_DATA += bash-completion/mkfs.bfs +endif + +if BUILD_MINIX dist_bashcompletion_DATA += \ - bash-completion/mkfs.bfs + bash-completion/fsck.minix \ + bash-completion/mkfs.minix endif + if BUILD_CRAMFS dist_bashcompletion_DATA += \ bash-completion/fsck.cramfs \ bash-completion/mkfs.cramfs endif -if BUILD_FSCK -dist_bashcompletion_DATA += \ - bash-completion/fsck -endif if BUILD_PARTX dist_bashcompletion_DATA += \ bash-completion/addpart \ @@ -54,210 +114,166 @@ dist_bashcompletion_DATA += \ bash-completion/partx endif if BUILD_RAW -dist_bashcompletion_DATA += \ - bash-completion/raw +dist_bashcompletion_DATA += bash-completion/raw endif if BUILD_SWAPLABEL -dist_bashcompletion_DATA += \ - bash-completion/swaplabel +dist_bashcompletion_DATA += bash-completion/swaplabel endif if BUILD_FDFORMAT -dist_bashcompletion_DATA += \ - bash-completion/fdformat +dist_bashcompletion_DATA += bash-completion/fdformat endif if LINUX -dist_bashcompletion_DATA += \ - bash-completion/blockdev +dist_bashcompletion_DATA += bash-completion/blockdev endif -# ...disk-utils -# fdisks... -if !ARCH_M68K -dist_bashcompletion_DATA += \ - bash-completion/fdisk -if !ARCH_SPARC -dist_bashcompletion_DATA += \ - bash-completion/sfdisk +if BUILD_FDISK +dist_bashcompletion_DATA += bash-completion/fdisk +endif +if BUILD_SFDISK +dist_bashcompletion_DATA += bash-completion/sfdisk +endif if BUILD_CFDISK -dist_bashcompletion_DATA += \ - bash-completion/cfdisk +dist_bashcompletion_DATA += bash-completion/cfdisk endif -endif # !ARCH_SPARC -endif # !ARCH_M68 -# ...fdisks -# login-utils... if BUILD_CHFN_CHSH dist_bashcompletion_DATA += \ bash-completion/chfn \ bash-completion/chsh endif -if BUILD_DEPRECATED_LAST -dist_bashcompletion_DATA += \ - bash-completion/last +if BUILD_LAST +dist_bashcompletion_DATA += bash-completion/last endif if BUILD_NEWGRP -dist_bashcompletion_DATA += \ - bash-completion/newgrp +dist_bashcompletion_DATA += bash-completion/newgrp endif if BUILD_SU -dist_bashcompletion_DATA += \ - bash-completion/su +dist_bashcompletion_DATA += bash-completion/su +endif + if BUILD_RUNUSER install-data-hook-bashcomp-runuser:: ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser INSTALL_DATA_HOOKS += install-data-hook-bashcomp-runuser endif -endif if BUILD_UTMPDUMP -dist_bashcompletion_DATA += \ - bash-completion/utmpdump +dist_bashcompletion_DATA += bash-completion/utmpdump endif -# ...login-utils - -# misc-utils... if BUILD_LIBUUID -dist_bashcompletion_DATA += \ - bash-completion/uuidgen +dist_bashcompletion_DATA += bash-completion/uuidgen endif if BUILD_UUIDD -dist_bashcompletion_DATA += \ - bash-completion/uuidd +dist_bashcompletion_DATA += bash-completion/uuidd endif if BUILD_LSBLK -dist_bashcompletion_DATA += \ - bash-completion/lsblk +dist_bashcompletion_DATA += bash-completion/lsblk endif if BUILD_LSLOCKS -dist_bashcompletion_DATA += \ - bash-completion/lslocks +dist_bashcompletion_DATA += bash-completion/lslocks endif if BUILD_RENAME -dist_bashcompletion_DATA += \ - bash-completion/rename +dist_bashcompletion_DATA += bash-completion/rename endif -# ...misc-utils - -# schedutils... if BUILD_CHRT -dist_bashcompletion_DATA += \ - bash-completion/chrt +dist_bashcompletion_DATA += bash-completion/chrt endif if BUILD_IONICE -dist_bashcompletion_DATA += \ - bash-completion/ionice +dist_bashcompletion_DATA += bash-completion/ionice endif if BUILD_TASKSET -dist_bashcompletion_DATA += \ - bash-completion/taskset +dist_bashcompletion_DATA += bash-completion/taskset endif -# ...schedutils -# sys-utils... if BUILD_CHCPU -dist_bashcompletion_DATA += \ - bash-completion/chcpu +dist_bashcompletion_DATA += bash-completion/chcpu endif if BUILD_EJECT -dist_bashcompletion_DATA += \ - bash-completion/eject +dist_bashcompletion_DATA += bash-completion/eject endif if BUILD_FALLOCATE -dist_bashcompletion_DATA += \ - bash-completion/fallocate +dist_bashcompletion_DATA += bash-completion/fallocate endif if BUILD_HWCLOCK -dist_bashcompletion_DATA += \ - bash-completion/hwclock +dist_bashcompletion_DATA += bash-completion/hwclock endif if BUILD_TUNELP -dist_bashcompletion_DATA += \ - bash-completion/tunelp +dist_bashcompletion_DATA += bash-completion/tunelp endif if BUILD_LSCPU -dist_bashcompletion_DATA += \ - bash-completion/lscpu +dist_bashcompletion_DATA += bash-completion/lscpu endif if BUILD_LOSETUP -dist_bashcompletion_DATA += \ - bash-completion/losetup +dist_bashcompletion_DATA += bash-completion/losetup endif if BUILD_MOUNTPOINT -dist_bashcompletion_DATA += \ - bash-completion/mountpoint +dist_bashcompletion_DATA += bash-completion/mountpoint endif if BUILD_NSENTER -dist_bashcompletion_DATA += \ - bash-completion/nsenter +dist_bashcompletion_DATA += bash-completion/nsenter endif if BUILD_PIVOT_ROOT -dist_bashcompletion_DATA += \ - bash-completion/pivot_root +dist_bashcompletion_DATA += bash-completion/pivot_root endif if BUILD_SETPRIV -dist_bashcompletion_DATA += \ - bash-completion/setpriv +dist_bashcompletion_DATA += bash-completion/setpriv endif if BUILD_SWAPON -dist_bashcompletion_DATA += \ - bash-completion/swapon +dist_bashcompletion_DATA += bash-completion/swapon endif if BUILD_UNSHARE -dist_bashcompletion_DATA += \ - bash-completion/unshare +dist_bashcompletion_DATA += bash-completion/unshare endif if BUILD_WDCTL -dist_bashcompletion_DATA += \ - bash-completion/wdctl +dist_bashcompletion_DATA += bash-completion/wdctl +endif +if BUILD_BLKDISCARD +dist_bashcompletion_DATA += bash-completion/blkdiscard +endif +if BUILD_CTRLALTDEL +dist_bashcompletion_DATA += bash-completion/ctrlaltdel +endif +if BUILD_DMESG +dist_bashcompletion_DATA += bash-completion/dmesg +endif +if BUILD_FSFREEZE +dist_bashcompletion_DATA += bash-completion/fsfreeze +endif +if BUILD_FSTRIM +dist_bashcompletion_DATA += bash-completion/fstrim +endif +if BUILD_LDATTACH +dist_bashcompletion_DATA += bash-completion/ldattach +endif +if BUILD_RTCWAKE +dist_bashcompletion_DATA += bash-completion/rtcwake +endif +if BUILD_SETARCH +dist_bashcompletion_DATA += bash-completion/setarch endif -if LINUX -dist_bashcompletion_DATA += \ - bash-completion/blkdiscard \ - bash-completion/ctrlaltdel \ - bash-completion/dmesg \ - bash-completion/fsfreeze \ - bash-completion/fstrim \ - bash-completion/ldattach \ - bash-completion/rtcwake \ - bash-completion/setarch -endif -# ...sys-utils -# term-utils... if BUILD_MESG -dist_bashcompletion_DATA += \ - bash-completion/mesg +dist_bashcompletion_DATA += bash-completion/mesg endif if BUILD_WALL -dist_bashcompletion_DATA += \ - bash-completion/wall +dist_bashcompletion_DATA += bash-completion/wall endif if BUILD_WRITE -dist_bashcompletion_DATA += \ - bash-completion/write +dist_bashcompletion_DATA += bash-completion/write endif -if LINUX -dist_bashcompletion_DATA += \ - bash-completion/setterm +if BUILD_SETTERM +dist_bashcompletion_DATA += bash-completion/setterm endif -# ...term-utils -# text-utils... if BUILD_MORE -dist_bashcompletion_DATA += \ - bash-completion/more +dist_bashcompletion_DATA += bash-completion/more endif if BUILD_PG -dist_bashcompletion_DATA += \ - bash-completion/pg +dist_bashcompletion_DATA += bash-completion/pg endif if BUILD_UL -dist_bashcompletion_DATA += \ - bash-completion/ul +dist_bashcompletion_DATA += bash-completion/ul endif -# ...text-utils - endif # BUILD_BASH_COMPLETION -- cgit v1.2.3-55-g7522