[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: RFA: new option
From: |
Tom Tromey |
Subject: |
Patch: RFA: new option |
Date: |
27 Jul 2003 20:02:27 -0600 |
We're slowly getting rid of the need for --cygnus mode.
For instance, I think we don't really want to use it in the gcc tree
any more -- I advocate turning on dependency tracking there now.
However, gcc has its own release process, not involving `make dist'.
Phil Edwards wanted to know if there was a `no-dist' option; that
seemed like a good idea to me so I wrote the appended patch.
Alexandre, tell me what I've missed. I've been out of automake
development for so long I'm afraid to check this in...
BTW I get an error from maintainer-check:
fleche. make maintainer-check
perllibdir=../automake/lib /usr/bin/perl -c -w automake
automake syntax OK
perllibdir=../automake/lib /usr/bin/perl -c -w aclocal
aclocal syntax OK
3901: undef $local;
Found undef in automake.in; use delete instead
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
* automake.texi (Options): Document no-dist.
* automake.in (process_option_list): Recognize no-dist.
(check_cygnus): Set no-dist option.
(handle_dist): Recognize no-dist.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1487
diff -u -r1.1487 automake.in
--- automake.in 26 Jul 2003 11:00:36 -0000 1.1487
+++ automake.in 28 Jul 2003 02:07:34 -0000
@@ -1186,7 +1186,7 @@
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'
@@ -3337,9 +3337,7 @@
{
my ($makefile) = @_;
- # `make dist' isn't used in a Cygnus-style tree.
- # Omit the rules so that people don't try to use them.
- return if $options{'cygnus'};
+ return if $options{'no-dist'};
# At least one of the archive formats must be enabled.
if ($relative_dir eq '.')
@@ -4756,6 +4754,7 @@
&set_strictness ('foreign');
$options{'no-installinfo'} = $options{'cygnus'};
$options{'no-dependencies'} = $options{'cygnus'};
+ $options{'no-dist'} = $options{'cygnus'};
err_ac "`AM_MAINTAINER_MODE' required when --cygnus specified"
if !$seen_maint_mode;
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.347
diff -u -r1.347 automake.texi
--- automake.texi 27 Jul 2003 12:58:38 -0000 1.347
+++ automake.texi 28 Jul 2003 02:07:37 -0000
@@ -4952,6 +4952,11 @@
to make automatic dependency tracking work @xref{Dependencies}. In this
case the effect is to effectively disable automatic dependency tracking.
address@hidden @code{no-dist}
address@hidden 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}.
- Patch: RFA: new option,
Tom Tromey <=