From 95d93536f8c036f5ba8815344930a8a03af5190a Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 26 Mar 2009 15:10:09 +0100 Subject: Generate .tar.bz2 on 'make dist' Automatically generate libcgroup*.tar.bz2 on 'make dist'. Some restructure of AC_INIT and AM_INIT was needed to archieve this and correct output filename. Namely AC_INIT( [package], ... ) is used as resulting tarball file name now. Also run automake and autoconf to refresh the generated stuff... Only configure.in contains manual changes, everything else is autoconf/automake bloat :(. Signed-off-by: Jan Safranek --- Makefile.in | 4 ++-- configure | 26 +++++++++++++------------- configure.in | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 77f7ded..e34492e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,7 +66,7 @@ am__remove_distdir = \ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -434,7 +434,6 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) - dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -458,6 +457,7 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff --git a/configure b/configure index 19cedb5..c67953c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for control groups library and utilities 0.34. +# Generated by GNU Autoconf 2.61 for libcgroup 0.34. # # Report bugs to . # @@ -726,10 +726,10 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='control groups library and utilities' -PACKAGE_TARNAME='control-groups-library-and-utilities' +PACKAGE_NAME='libcgroup' +PACKAGE_TARNAME='libcgroup' PACKAGE_VERSION='0.34' -PACKAGE_STRING='control groups library and utilities 0.34' +PACKAGE_STRING='libcgroup 0.34' PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?group_id=218421&atid=1043649' ac_unique_file="src" @@ -1401,7 +1401,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures control groups library and utilities 0.34 to adapt to many kinds of systems. +\`configure' configures libcgroup 0.34 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1449,7 +1449,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/control-groups-library-and-utilities] + --docdir=DIR documentation root [DATAROOTDIR/doc/libcgroup] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1471,7 +1471,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of control groups library and utilities 0.34:";; + short | recursive ) echo "Configuration of libcgroup 0.34:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -control groups library and utilities configure 0.34 +libcgroup configure 0.34 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1593,7 +1593,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by control groups library and utilities $as_me 0.34, which was +It was created by libcgroup $as_me 0.34, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2282,8 +2282,8 @@ fi # Define the identity of the package. - PACKAGE=libcgroup - VERSION=0.34 + PACKAGE='libcgroup' + VERSION='0.34' cat >>confdefs.h <<_ACEOF @@ -22322,7 +22322,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by control groups library and utilities $as_me 0.34, which was +This file was extended by libcgroup $as_me 0.34, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22375,7 +22375,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -control groups library and utilities config.status 0.34 +libcgroup config.status 0.34 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index c0ab521..0d82f96 100644 --- a/configure.in +++ b/configure.in @@ -15,9 +15,9 @@ AC_PREREQ(2.61) # In following section update all occurences of version, including soname -AC_INIT([control groups library and utilities], 0.34, +AC_INIT([libcgroup], 0.34, [http://sourceforge.net/tracker/?group_id=218421&atid=1043649]) -AM_INIT_AUTOMAKE(libcgroup, 0.34) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) # set library version, soname is libcgroup.so.MAJOR AC_SUBST(LIBRARY_VERSION_MAJOR, 1) AC_SUBST(LIBRARY_VERSION_MINOR, 0) -- cgit