From: Tom Tromey Date: Tue, 30 Sep 2003 19:05:54 +0000 (+0000) Subject: * lib/Automake/Options.pm (_process_option_list): Recognize X-Git-Tag: Release-1-7b~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8735ca145284b744c2ae9c40ea5e6787035e8e1e;p=thirdparty%2Fautomake.git * lib/Automake/Options.pm (_process_option_list): Recognize no-dist. * NEWS: Update. * doc/automake.texi (Options): Document no-dist. * automake.in (check_cygnus): Set no-dist option. (handle_dist): Recognize no-dist. * tests/nodist3.test: New file. * tests/Makefile.am (TESTS): Added nodist3.test. --- diff --git a/ChangeLog b/ChangeLog index e9bddd3af..c8e579b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-09-30 Tom Tromey + + * lib/Automake/Options.pm (_process_option_list): Recognize + no-dist. + * NEWS: Update. + * doc/automake.texi (Options): Document no-dist. + * automake.in (check_cygnus): Set no-dist option. + (handle_dist): Recognize no-dist. + * tests/nodist3.test: New file. + * tests/Makefile.am (TESTS): Added nodist3.test. + 2003-09-29 Alexandre Duret-Lutz * automake.in (handle_clean): Take $makefile as argument, and diff --git a/NEWS b/NEWS index 81d0f8a7b..11c23d3de 100644 --- a/NEWS +++ b/NEWS @@ -78,6 +78,8 @@ New in 1.7a: - New option no-dist-gzip. + - New option no-dist. + - install-sh now understands --version and --help. - Automake will now recognize AC_CONFIG_LINKS so far as removing created diff --git a/automake.in b/automake.in index c1577c574..98e7ee51a 100755 --- a/automake.in +++ b/automake.in @@ -3046,9 +3046,7 @@ sub for_dist_common # Handle 'dist' target. sub handle_dist () { - # `make dist' isn't used in a Cygnus-style tree. - # Omit the rules so that people don't try to use them. - return if option 'cygnus'; + return if option 'no-dist'; # At least one of the archive formats must be enabled. if ($relative_dir eq '.') @@ -4506,6 +4504,7 @@ sub check_cygnus set_strictness ('foreign'); set_option ('no-installinfo', $cygnus); set_option ('no-dependencies', $cygnus); + set_option ('no-dist', $cygnus); err_ac "`AM_MAINTAINER_MODE' required when --cygnus specified" if !$seen_maint_mode; diff --git a/configure b/configure index bce361b22..5293c3ec8 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.57c for GNU Automake 1.7a. +# Generated by GNU Autoconf 2.57f for GNU Automake 1.7a. # # Report bugs to . # @@ -21,6 +21,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -219,6 +220,7 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi @@ -854,7 +856,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF GNU Automake configure 1.7a -generated by GNU Autoconf 2.57c +generated by GNU Autoconf 2.57f Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -868,7 +870,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by GNU Automake $as_me 1.7a, which was -generated by GNU Autoconf 2.57c. Invocation command line was +generated by GNU Autoconf 2.57f. Invocation command line was $ $0 $@ @@ -2001,6 +2003,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -2201,6 +2204,7 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi @@ -2237,7 +2241,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by GNU Automake $as_me 1.7a, which was -generated by GNU Autoconf 2.57c. Invocation command line was +generated by GNU Autoconf 2.57f. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2292,7 +2296,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ GNU Automake config.status 1.7a -configured by $0, generated by GNU Autoconf 2.57c, +configured by $0, generated by GNU Autoconf 2.57f, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/doc/automake.texi b/doc/automake.texi index 33038f182..8ea81d30d 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -5380,6 +5380,11 @@ is useful for those situations where you don't have the necessary bits to make automatic dependency tracking work @xref{Dependencies}. In this case the effect is to effectively disable automatic dependency tracking. +@item @code{no-dist} +@cindex Option, no-dist +Don't emit any code related to @code{dist} target. This is useful +when a package has its own method for making distributions. + @item @code{no-dist-gzip} @cindex Option, no-dist-gzip Do not hook @code{dist-gzip} to @code{dist}. diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index b1dd680f0..cb0667263 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -261,7 +261,7 @@ sub _process_option_list (\%$@) elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo' || $_ eq 'dist-shar' || $_ eq 'dist-zip' || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2' - || $_ eq 'no-dist-gzip' + || $_ eq 'no-dist-gzip' || $_ eq 'no-dist' || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex' || $_ eq 'readme-alpha' || $_ eq 'check-news' || $_ eq 'subdir-objects' || $_ eq 'nostdinc' diff --git a/tests/Makefile.am b/tests/Makefile.am index 4ccdcd2f3..68a136fdf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -314,6 +314,7 @@ nodep.test \ nodepcomp.test \ nodist.test \ nodist2.test \ +nodist3.test \ nogzip.test \ nogzip2.test \ noinst.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index fe674dc73..6e5c2961b 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -424,6 +424,7 @@ nodep.test \ nodepcomp.test \ nodist.test \ nodist2.test \ +nodist3.test \ nogzip.test \ nogzip2.test \ noinst.test \ diff --git a/tests/nodist3.test b/tests/nodist3.test new file mode 100755 index 000000000..b933d898f --- /dev/null +++ b/tests/nodist3.test @@ -0,0 +1,40 @@ +#! /bin/sh +# Copyright (C) 2003 Free Software Foundation, Inc. +# +# This file is part of GNU Automake. +# +# GNU Automake is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Automake is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with autoconf; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# Test to make sure no-dist option works. + +. ./defs || exit 1 + +echo AC_PROG_CC >> configure.in + +cat > Makefile.am << 'END' +AUTOMAKE_OPTIONS = no-dist +bin_PROGRAMS = eyeball +eyeball_SOURCES = a.c +END + +: > a.c + +$ACLOCAL || exit 1 +$AUTOMAKE || exit 1 + +grep '^dist:' Makefile.in + +exit 0