[PATCH] Output files with LF only
Hi, someone mis-applied my patch so that ``binmode'' was set _after_ Automake had opened a file for writing. Regards, Morten Index: ChangeLog === RCS file: /cvs/automake/automake/ChangeLog,v retrieving revision 1.904 diff -u -r1.904 ChangeLog --- ChangeLog 2000/10/23 18:58:33 1.904 +++ ChangeLog 2000/11/15 11:41:42 @@ -1,3 +1,8 @@ +2000-11-15 Morten Eriksen <[EMAIL PROTECTED]> + + * aclocal.in (write_aclocal): Set ``binmode'' after file has been + opened, otherwise it has no effect. + 2000-10-23 Morten Eriksen <[EMAIL PROTECTED]> * aclocal.in (write_aclocal): Don't write aclocal.m4 with Index: aclocal.in === RCS file: /cvs/automake/automake/aclocal.in,v retrieving revision 1.49 diff -u -r1.49 aclocal.in --- aclocal.in 2000/10/23 18:58:33 1.49 +++ aclocal.in 2000/11/15 11:41:44 @@ -427,6 +427,8 @@ print STDERR "Writing $output_file\n" if $verbosity; +open (ACLOCAL, "> " . $output_file) + || die "aclocal: couldn't open \`$output_file' for writing: $!\n"; # In case we're running under MSWindows, don't write with CRLF. # (This circumvents a bug in at least Cygwin bash where the shell @@ -434,8 +436,6 @@ # and CRLF.) binmode ACLOCAL; -open (ACLOCAL, "> " . $output_file) - || die "aclocal: couldn't open \`$output_file' for writing: $!\n"; print ACLOCAL "# $output_file generated automatically by aclocal $VERSION\n"; print ACLOCAL "\ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
defining recursive targets
is there some easy (i.e. not involving hacking) way to define a new recursive target? e.g.: RECURSIVE_TARGETS = remotecheck which would shove remotecheck-recursive into the list with generated targets all-recursive, check-recursive, install-recursive, etc. and add a remotecheck & remotecheck-local in each Makefile.in? Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) -- 160. I'm not a complete idiot - several parts are missing.
Re: Default clean files
"Derek R. Price" wrote:
> I'm in the middle of an attempt to convert CVS to use automake but I'm
> having some trouble. Is there some way to selectively override clean
> targets created by default for info targets without having to specify
> the entire clean target manually?
>
> I specified
>
> info_TEXINFOS = cvs.texinfo cvsclient.texi
>
> and it seems to be creating a clean target that removes the 'cvs.ps'
> file despite the fact that 'cvs.ps' is listed in EXTRA_DIST.
Here's a patch that subtracts any generated files listed in EXTRA_DIST from the
mostlyclean-aminfo targets and adds them to the maintainer-clean-aminfo targets.
It seems to me that this might be more generalizable (anything in EXTRA_DIST, if
it exists in any clean target, should be moved into the maintainer-clean targeet,
but this patch does what I need.
Derek
--
Derek Price CVS Solutions Architect ( http://CVSHome.org )
mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com )
--
Boy: A noise with dirt on it
--- /usr/bin/automake Wed Jul 12 05:40:03 2000
+++ /tmp/automake Tue Nov 14 16:01:58 2000
@@ -1984,7 +1984,25 @@
'ky', 'kys', 'ps', 'log', 'pg', 'toc', 'tp', 'tps',
'vr', 'vrs', 'op', 'tr', 'cv', 'cn')
{
- push (@texi_cleans, $infobase . '.' . $tc_cursor);
+ if (&variable_defined ('EXTRA_DIST'))
+ {
+ local $temp_clean = $infobase . '.' . $tc_cursor;
+ local @extra_dist = &variable_value_as_list ('EXTRA_DIST', '');
+ $temp_clean =~ s/\W/\\$&/g;
+ $temp_clean = '^' . $temp_clean . '$';
+ if (grep /$temp_clean/, @extra_dist)
+ {
+ push (@texi_maintainercleans, $infobase . '.' . $tc_cursor);
+ }
+ else
+ {
+ push (@texi_cleans, $infobase . '.' . $tc_cursor);
+ }
+ }
+ else
+ {
+ push (@texi_cleans, $infobase . '.' . $tc_cursor);
+ }
}
}
@@ -2047,7 +2065,8 @@
# How to clean. The funny name is due to --cygnus influence; in
# Cygnus mode, `clean-info' is a target that users can use.
$output_rules .= "\nmostlyclean-aminfo:\n";
-&pretty_print_rule ("\t-rm -f", "\t ", @texi_cleans);
+&pretty_print_rule ("\t-rm -f", "\t ", @texi_cleans)
+ if (scalar @texi_cleans);
$output_rules .= ("\nclean-aminfo:\n\ndistclean-aminfo:\n\n"
. "maintainer-clean-aminfo:\n\t"
# Eww. But how else can we find all the output
@@ -2059,6 +2078,9 @@
. "\t" . 'rm -f $$i-[0-9]*;' . " \\\n"
. "\t" . ' fi;' . " \\\n"
. "\tdone\n");
+&pretty_print_rule ("\t-rm -f", "\t ", @texi_maintainercleans)
+ if (scalar @texi_maintainercleans);
+$output_rules .= "\n";
&push_phony_cleaners ('aminfo');
if ($cygnus_mode)
{
Re: HP 11.0 acc 3.25 help with purify
On Nov 14, 2000, Tim Heath <[EMAIL PROTECTED]> wrote:
> I have modified the make file generated by automake because aCC does
> not support the same dependency generation that CC does.
Which automake are you talking about? automake 1.4 needs GNU make and
GCC for dependency tracking; CVS automake will attempt to figure out
some dependency tracking mechanism that works with the selected
compiler.
--
Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicampoliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist*Please* write to mailing lists, not to me
