Imported Upstream version 1.3upstream/1.3

1 files changed, 2 insertions, 169 deletions

diff --git a/Makefile.am b/Makefile.am
index 93574a71..dcecc32c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,172 +1,7 @@
-SUBDIRS = test
+SUBDIRS = completions test
 
 sysconf_DATA = bash_completion
 
-bashcompdir = $(sysconfdir)/bash_completion.d
-bashcomp_DATA = contrib/abook \
-		contrib/ant \
-		contrib/apache2ctl \
-		contrib/apt \
-		contrib/apt-build \
-		contrib/aptitude \
-		contrib/aspell \
-		contrib/autorpm \
-		contrib/bash-builtins \
-		contrib/bind-utils \
-		contrib/bitkeeper \
-		contrib/bittorrent \
-		contrib/bluez \
-		contrib/brctl \
-		contrib/bzip2 \
-		contrib/cardctl \
-		contrib/cfengine \
-		contrib/chkconfig \
-		contrib/chsh \
-		contrib/cksfv \
-		contrib/clisp \
-		contrib/configure \
-		contrib/coreutils \
-		contrib/cowsay \
-		contrib/cpan2dist \
-		contrib/cpio \
-		contrib/cups \
-		contrib/cryptsetup \
-		contrib/cvs \
-		contrib/cvsps \
-		contrib/dd \
-		contrib/dhclient \
-		contrib/dict \
-		contrib/dpkg \
-		contrib/dselect \
-		contrib/dsniff \
-		contrib/findutils \
-		contrib/freeciv \
-		contrib/fuse \
-		contrib/gcc \
-		contrib/gcl \
-		contrib/gdb \
-		contrib/genisoimage \
-		contrib/getent \
-		contrib/gkrellm \
-		contrib/gnatmake \
-		contrib/gpg \
-		contrib/gpg2 \
-		contrib/gzip \
-		contrib/heimdal \
-		contrib/hping2 \
-		contrib/iconv \
-		contrib/ifupdown \
-		contrib/imagemagick \
-		contrib/info \
-		contrib/iptables \
-		contrib/ipmitool \
-		contrib/ipsec \
-		contrib/ipv6calc \
-		contrib/isql \
-		contrib/jar \
-		contrib/java \
-		contrib/k3b \
-		contrib/kldload \
-		contrib/larch \
-		contrib/ldapvi \
-		contrib/lftp \
-		contrib/lilo \
-		contrib/links \
-		contrib/lintian \
-		contrib/lisp \
-		contrib/lvm \
-		contrib/lzma \
-		contrib/lzop \
-		contrib/mailman \
-		contrib/make \
-		contrib/man \
-		contrib/mc \
-		contrib/mcrypt \
-		contrib/mdadm \
-		contrib/medusa \
-		contrib/minicom \
-		contrib/mkinitrd \
-		contrib/module-init-tools \
-		contrib/monodevelop \
-		contrib/mount \
-		contrib/mplayer \
-		contrib/msynctool \
-		contrib/mtx \
-		contrib/munin-node \
-		contrib/mutt \
-		contrib/mysqladmin \
-		contrib/ncftp \
-		contrib/net-tools \
-		contrib/nmap \
-		contrib/ntpdate \
-		contrib/openldap \
-		contrib/openssl \
-		contrib/p4 \
-		contrib/perl \
-		contrib/pine \
-		contrib/pkg-config \
-		contrib/pkg_install \
-		contrib/pkgtools \
-		contrib/pm-utils \
-		contrib/portupgrade \
-		contrib/postfix \
-		contrib/postgresql \
-		contrib/povray \
-		contrib/procps \
-		contrib/python \
-		contrib/qdbus \
-		contrib/qemu \
-		contrib/quota-tools \
-		contrib/rcs \
-		contrib/rdesktop \
-		contrib/reportbug \
-		contrib/resolvconf \
-		contrib/rfkill \
-		contrib/ri \
-		contrib/rpcdebug \
-		contrib/rpm \
-		contrib/rpmcheck \
-		contrib/rrdtool \
-		contrib/rsync \
-		contrib/rtcwake \
-		contrib/samba \
-		contrib/sbcl \
-		contrib/screen \
-		contrib/service \
-		contrib/shadow \
-		contrib/sitecopy \
-		contrib/smartctl \
-		contrib/snownews \
-		contrib/ssh \
-		contrib/sshfs \
-		contrib/strace \
-		contrib/svk \
-		contrib/sysctl \
-		contrib/sysv-rc \
-		contrib/tar \
-		contrib/tcpdump \
-		contrib/unace \
-		contrib/unrar \
-		contrib/update-alternatives \
-		contrib/util-linux \
-		contrib/vncviewer \
-		contrib/vpnc \
-		contrib/wireless-tools \
-		contrib/wodim \
-		contrib/wol \
-		contrib/wtf \
-		contrib/wvdial \
-		contrib/xhost \
-		contrib/xm \
-		contrib/xmllint \
-		contrib/xmlwf \
-		contrib/xmms \
-		contrib/xrandr \
-		contrib/xsltproc \
-		contrib/xz \
-		contrib/yp-tools \
-		contrib/yum-arch
-
 profiledir = $(sysconfdir)/profile.d
 profile_DATA = bash_completion.sh
 
@@ -175,6 +10,4 @@ bash_completion.sh: bash_completion.sh.in Makefile
 
 CLEANFILES = bash_completion.sh
 
-EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) bash_completion.sh.in \
-	contrib/_mock contrib/_modules contrib/_subversion contrib/_yum \
-	contrib/_yum-utils
+EXTRA_DIST = CHANGES $(sysconf_DATA) bash_completion.sh.in