[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 07b7ddd1dd9311a4bd8ca9bac415c8e6ab84518d

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit 6d556ee5b782acc623d10c6dd22aa3b7f3b3e6e6
Author: Guillaume Rousse <Guillaume.Rousse at inria.fr>
Date:   Mon Aug 2 22:07:24 2010 +0200

    split installation logic for completions in a separate Makefile.am, for
    easier management of generated files

diff --git a/Makefile.am b/Makefile.am
index 331d234..ffc8442 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,175 +1,7 @@
-SUBDIRS = test
+SUBDIRS = contrib 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/crontab \
-		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/lrzip \
-		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/sqlite3 \
-		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
 
@@ -178,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
diff --git a/configure.ac b/configure.ac
index 63f0898..1aba9e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
-AC_CONFIG_FILES([Makefile test/Makefile])
+AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
+AC_CONFIG_FILES([Makefile contrib/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..6c5a586
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,172 @@
+bashcomp_DATA = abook \
+		ant \
+		apache2ctl \
+		apt \
+		apt-build \
+		aptitude \
+		aspell \
+		autorpm \
+		bash-builtins \
+		bind-utils \
+		bitkeeper \
+		bittorrent \
+		bluez \
+		brctl \
+		bzip2 \
+		cardctl \
+		cfengine \
+		chkconfig \
+		chsh \
+		cksfv \
+		clisp \
+		configure \
+		coreutils \
+		cowsay \
+		cpan2dist \
+		cpio \
+		crontab \
+		cups \
+		cryptsetup \
+		cvs \
+		cvsps \
+		dd \
+		dhclient \
+		dict \
+		dpkg \
+		dselect \
+		dsniff \
+		findutils \
+		freeciv \
+		fuse \
+		gcc \
+		gcl \
+		gdb \
+		genisoimage \
+		getent \
+		gkrellm \
+		gnatmake \
+		gpg \
+		gpg2 \
+		gzip \
+		heimdal \
+		hping2 \
+		iconv \
+		ifupdown \
+		imagemagick \
+		info \
+		iptables \
+		ipmitool \
+		ipsec \
+		ipv6calc \
+		isql \
+		jar \
+		java \
+		k3b \
+		kldload \
+		larch \
+		ldapvi \
+		lftp \
+		lilo \
+		links \
+		lintian \
+		lisp \
+		lrzip \
+		lvm \
+		lzma \
+		lzop \
+		mailman \
+		make \
+		man \
+		mc \
+		mcrypt \
+		mdadm \
+		medusa \
+		minicom \
+		mkinitrd \
+		module-init-tools \
+		monodevelop \
+		mount \
+		mplayer \
+		msynctool \
+		mtx \
+		munin-node \
+		mutt \
+		mysqladmin \
+		ncftp \
+		net-tools \
+		nmap \
+		ntpdate \
+		openldap \
+		openssl \
+		p4 \
+		perl \
+		pine \
+		pkg-config \
+		pkg_install \
+		pkgtools \
+		pm-utils \
+		portupgrade \
+		postfix \
+		postgresql \
+		povray \
+		procps \
+		python \
+		qdbus \
+		qemu \
+		quota-tools \
+		rcs \
+		rdesktop \
+		reportbug \
+		resolvconf \
+		rfkill \
+		ri \
+		rpcdebug \
+		rpm \
+		rpmcheck \
+		rrdtool \
+		rsync \
+		rtcwake \
+		samba \
+		sbcl \
+		screen \
+		service \
+		shadow \
+		sitecopy \
+		smartctl \
+		snownews \
+		sqlite3 \
+		ssh \
+		sshfs \
+		strace \
+		svk \
+		sysctl \
+		sysv-rc \
+		tar \
+		tcpdump \
+		unace \
+		unrar \
+		update-alternatives \
+		util-linux \
+		vncviewer \
+		vpnc \
+		wireless-tools \
+		wodim \
+		wol \
+		wtf \
+		wvdial \
+		xhost \
+		xm \
+		xmllint \
+		xmlwf \
+		xmms \
+		xrandr \
+		xsltproc \
+		xz \
+		yp-tools \
+		yum-arch
+
+EXTRA_DIST = $(bashcomp_DATA) \
+	     _mock _modules _subversion _yum _yum-utils
+
+CLEANFILES = perl
+

-- 
bash-completion