* Use $(SHELL) when running move-if-change
@ 2004-12-20 21:22 Ian Lance Taylor
2004-12-20 23:49 ` Ben Elliston
0 siblings, 1 reply; 7+ messages in thread
From: Ian Lance Taylor @ 2004-12-20 21:22 UTC (permalink / raw)
To: binutils
I'm checking in this patch to bfd/doc/Makefile.am to use $(SHELL) when
running move-if-change. $(SHELL) should always be used with
move-if-change or indeed any shell script. I suppose this one went
unfixed for so long because it is only run when recreating info files,
which normally does not need to be done when using a released version.
Ian
2004-12-20 Ian Lance Taylor <ian@c2microsystems.com>
* Makefile.am: Use $(SHELL) whenever we run move-if-change.
* Makefile.in: Rebuild.
Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/doc/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- Makefile.am 19 Sep 2004 22:32:12 -0000 1.12
+++ Makefile.am 20 Dec 2004 21:20:30 -0000
@@ -76,19 +76,19 @@
s-aoutx: $(MKDOC) $(srcdir)/../aoutx.h $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../aoutx.h >aoutx.tmp
- $(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
+ $(SHELL) $(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
touch s-aoutx
aoutx.texi: s-aoutx
s-archive: $(MKDOC) $(srcdir)/../archive.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../archive.c >archive.tmp
- $(srcdir)/../../move-if-change archive.tmp archive.texi
+ $(SHELL) $(srcdir)/../../move-if-change archive.tmp archive.texi
touch s-archive
archive.texi: s-archive
s-archures: $(MKDOC) $(srcdir)/../archures.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../archures.c >archures.tmp
- $(srcdir)/../../move-if-change archures.tmp archures.texi
+ $(SHELL) $(srcdir)/../../move-if-change archures.tmp archures.texi
touch s-archures
archures.texi: s-archures
@@ -96,115 +96,115 @@
# bfd.texinfo on an 8.3 filesystem.
s-bfd: $(MKDOC) $(srcdir)/../bfd.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
- $(srcdir)/../../move-if-change bfd.tmp bfdt.texi
+ $(SHELL) $(srcdir)/../../move-if-change bfd.tmp bfdt.texi
touch s-bfd
bfdt.texi: s-bfd
s-cache: $(MKDOC) $(srcdir)/../cache.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../cache.c >cache.tmp
- $(srcdir)/../../move-if-change cache.tmp cache.texi
+ $(SHELL) $(srcdir)/../../move-if-change cache.tmp cache.texi
touch s-cache
cache.texi: s-cache
s-coffcode: $(MKDOC) $(srcdir)/../coffcode.h $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../coffcode.h >coffcode.tmp
- $(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
+ $(SHELL) $(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
touch s-coffcode
coffcode.texi: s-coffcode
s-core: $(MKDOC) $(srcdir)/../corefile.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../corefile.c >core.tmp
- $(srcdir)/../../move-if-change core.tmp core.texi
+ $(SHELL) $(srcdir)/../../move-if-change core.tmp core.texi
touch s-core
core.texi: s-core
s-elf: $(MKDOC) $(srcdir)/../elf.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elf.c >elf.tmp
- $(srcdir)/../../move-if-change elf.tmp elf.texi
+ $(SHELL) $(srcdir)/../../move-if-change elf.tmp elf.texi
touch s-elf
elf.texi: s-elf
s-elfcode: $(MKDOC) $(srcdir)/../elfcode.h $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elfcode.h >elfcode.tmp
- $(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
+ $(SHELL) $(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
touch s-elfcode
elfcode.texi: s-elfcode
s-mmo: $(MKDOC) $(srcdir)/../mmo.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../mmo.c >mmo.tmp
- $(srcdir)/../../move-if-change mmo.tmp mmo.texi
+ $(SHELL) $(srcdir)/../../move-if-change mmo.tmp mmo.texi
touch s-mmo
mmo.texi: s-mmo
s-format: $(MKDOC) $(srcdir)/../format.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../format.c >format.tmp
- $(srcdir)/../../move-if-change format.tmp format.texi
+ $(SHELL) $(srcdir)/../../move-if-change format.tmp format.texi
touch s-format
format.texi: s-format
s-libbfd: $(MKDOC) $(srcdir)/../libbfd.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../libbfd.c >libbfd.tmp
- $(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
+ $(SHELL) $(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
touch s-libbfd
libbfd.texi: s-libbfd
s-bfdio: $(MKDOC) $(srcdir)/../bfdio.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfdio.c >bfdio.tmp
- $(srcdir)/../../move-if-change bfdio.tmp bfdio.texi
+ $(SHELL) $(srcdir)/../../move-if-change bfdio.tmp bfdio.texi
touch s-bfdio
bfdio.texi: s-bfdio
s-bfdwin: $(MKDOC) $(srcdir)/../bfdwin.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfdwin.c >bfdwin.tmp
- $(srcdir)/../../move-if-change bfdwin.tmp bfdwin.texi
+ $(SHELL) $(srcdir)/../../move-if-change bfdwin.tmp bfdwin.texi
touch s-bfdwin
bfdwin.texi: s-bfdwin
s-opncls: $(MKDOC) $(srcdir)/../opncls.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../opncls.c >opncls.tmp
- $(srcdir)/../../move-if-change opncls.tmp opncls.texi
+ $(SHELL) $(srcdir)/../../move-if-change opncls.tmp opncls.texi
touch s-opncls
opncls.texi: s-opncls
s-reloc: $(MKDOC) $(srcdir)/../reloc.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../reloc.c >reloc.tmp
- $(srcdir)/../../move-if-change reloc.tmp reloc.texi
+ $(SHELL) $(srcdir)/../../move-if-change reloc.tmp reloc.texi
touch s-reloc
reloc.texi: s-reloc
s-section: $(MKDOC) $(srcdir)/../section.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../section.c >section.tmp
- $(srcdir)/../../move-if-change section.tmp section.texi
+ $(SHELL) $(srcdir)/../../move-if-change section.tmp section.texi
touch s-section
section.texi: s-section
s-syms: $(MKDOC) $(srcdir)/../syms.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../syms.c >syms.tmp
- $(srcdir)/../../move-if-change syms.tmp syms.texi
+ $(SHELL) $(srcdir)/../../move-if-change syms.tmp syms.texi
touch s-syms
syms.texi: s-syms
s-targets: $(MKDOC) $(srcdir)/../targets.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../targets.c >targets.tmp
- $(srcdir)/../../move-if-change targets.tmp targets.texi
+ $(SHELL) $(srcdir)/../../move-if-change targets.tmp targets.texi
touch s-targets
targets.texi: s-targets
s-init: $(MKDOC) $(srcdir)/../init.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../init.c >init.tmp
- $(srcdir)/../../move-if-change init.tmp init.texi
+ $(SHELL) $(srcdir)/../../move-if-change init.tmp init.texi
touch s-init
init.texi: s-init
s-hash: $(MKDOC) $(srcdir)/../hash.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../hash.c >hash.tmp
- $(srcdir)/../../move-if-change hash.tmp hash.texi
+ $(SHELL) $(srcdir)/../../move-if-change hash.tmp hash.texi
touch s-hash
hash.texi: s-hash
s-linker: $(MKDOC) $(srcdir)/../linker.c $(srcdir)/doc.str
./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../linker.c >linker.tmp
- $(srcdir)/../../move-if-change linker.tmp linker.texi
+ $(SHELL) $(srcdir)/../../move-if-change linker.tmp linker.texi
touch s-linker
linker.texi: s-linker
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Use $(SHELL) when running move-if-change
2004-12-20 21:22 Use $(SHELL) when running move-if-change Ian Lance Taylor
@ 2004-12-20 23:49 ` Ben Elliston
2004-12-21 2:32 ` Ian Lance Taylor
0 siblings, 1 reply; 7+ messages in thread
From: Ben Elliston @ 2004-12-20 23:49 UTC (permalink / raw)
To: binutils
Ian Lance Taylor <ian@airs.com> writes:
> I'm checking in this patch to bfd/doc/Makefile.am to use $(SHELL)
> when running move-if-change. $(SHELL) should always be used with
> move-if-change or indeed any shell script. I suppose this one went
> unfixed for so long because it is only run when recreating info
> files, which normally does not need to be done when using a released
> version.
While we're discussing move-if-change here is a trivial patch that has
been sitting in my tree for some time. I always build with make -s,
so this bugs me perhaps more than most. Like mv(1), move-if-change
should be silent, too. Okay for mainline?
2004-11-01 Ben Elliston <bje@au.ibm.com>
* move-if-change: Don't produce any output, just like mv(1).
Index: move-if-change
===================================================================
RCS file: /home/bje/gcc-cvs/gcc/move-if-change,v
retrieving revision 1.3
diff -u -p -r1.3 move-if-change
--- move-if-change 11 Jan 1999 14:12:18 -0000 1.3
+++ move-if-change 20 Dec 2004 23:48:07 -0000
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ then
if
cmp $1 $2 > /dev/null
then
-echo $2 is unchanged
rm -f $1
else
mv -f $1 $2
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Use $(SHELL) when running move-if-change
2004-12-20 23:49 ` Ben Elliston
@ 2004-12-21 2:32 ` Ian Lance Taylor
2004-12-21 3:20 ` Daniel Jacobowitz
2004-12-21 21:05 ` DJ Delorie
0 siblings, 2 replies; 7+ messages in thread
From: Ian Lance Taylor @ 2004-12-21 2:32 UTC (permalink / raw)
To: Ben Elliston; +Cc: binutils
Ben Elliston <bje@au.ibm.com> writes:
> Ian Lance Taylor <ian@airs.com> writes:
>
> > I'm checking in this patch to bfd/doc/Makefile.am to use $(SHELL)
> > when running move-if-change. $(SHELL) should always be used with
> > move-if-change or indeed any shell script. I suppose this one went
> > unfixed for so long because it is only run when recreating info
> > files, which normally does not need to be done when using a released
> > version.
>
> While we're discussing move-if-change here is a trivial patch that has
> been sitting in my tree for some time. I always build with make -s,
> so this bugs me perhaps more than most. Like mv(1), move-if-change
> should be silent, too. Okay for mainline?
>
> 2004-11-01 Ben Elliston <bje@au.ibm.com>
>
> * move-if-change: Don't produce any output, just like mv(1).
Personally I would just as soon keep the top level files in synch with
gcc as much as possible. So, how about if it is accepted for gcc,
it's OK for binutils?
If we want to get fancy, we could try this patch:
--- move-if-change.~1~ 2004-12-20 21:26:12.422896127 -0500
+++ move-if-change 2004-12-20 21:31:21.019936480 -0500
@@ -22,7 +22,10 @@
if
cmp $1 $2 > /dev/null
then
-echo $2 is unchanged
+case `echo "$MAKEFLAGS" | sed -e 's/\([^ ]*\).*/\1/'` in
+ *s*) ;;
+ *) echo $2 is unchanged ;;
+esac
rm -f $1
else
mv -f $1 $2
Ian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Use $(SHELL) when running move-if-change
2004-12-21 2:32 ` Ian Lance Taylor
@ 2004-12-21 3:20 ` Daniel Jacobowitz
2004-12-21 5:16 ` Ben Elliston
2004-12-21 21:05 ` DJ Delorie
1 sibling, 1 reply; 7+ messages in thread
From: Daniel Jacobowitz @ 2004-12-21 3:20 UTC (permalink / raw)
To: binutils, bje
On Mon, Dec 20, 2004 at 09:32:25PM -0500, Ian Lance Taylor wrote:
> Ben Elliston <bje@au.ibm.com> writes:
>
> > Ian Lance Taylor <ian@airs.com> writes:
> >
> > > I'm checking in this patch to bfd/doc/Makefile.am to use $(SHELL)
> > > when running move-if-change. $(SHELL) should always be used with
> > > move-if-change or indeed any shell script. I suppose this one went
> > > unfixed for so long because it is only run when recreating info
> > > files, which normally does not need to be done when using a released
> > > version.
> >
> > While we're discussing move-if-change here is a trivial patch that has
> > been sitting in my tree for some time. I always build with make -s,
> > so this bugs me perhaps more than most. Like mv(1), move-if-change
> > should be silent, too. Okay for mainline?
> >
> > 2004-11-01 Ben Elliston <bje@au.ibm.com>
> >
> > * move-if-change: Don't produce any output, just like mv(1).
>
> Personally I would just as soon keep the top level files in synch with
> gcc as much as possible. So, how about if it is accepted for gcc,
> it's OK for binutils?
>
> If we want to get fancy, we could try this patch:
Please. I find the output valuable when I'm trying to see what was
rebuilt (and the silencing valuable for make -s, too).
--
Daniel Jacobowitz
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Use $(SHELL) when running move-if-change
2004-12-21 3:20 ` Daniel Jacobowitz
@ 2004-12-21 5:16 ` Ben Elliston
2004-12-21 8:20 ` Nick Clifton
0 siblings, 1 reply; 7+ messages in thread
From: Ben Elliston @ 2004-12-21 5:16 UTC (permalink / raw)
To: binutils
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
> > If we want to get fancy, we could try this patch:
>
> Please. I find the output valuable when I'm trying to see what was
> rebuilt (and the silencing valuable for make -s, too).
Yes, agreed. Okay to commit to src/move-if-change, dear maintainers?
Ben
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Use $(SHELL) when running move-if-change
2004-12-21 5:16 ` Ben Elliston
@ 2004-12-21 8:20 ` Nick Clifton
0 siblings, 0 replies; 7+ messages in thread
From: Nick Clifton @ 2004-12-21 8:20 UTC (permalink / raw)
To: Ben Elliston; +Cc: binutils
Hi Ben,
>>Please. I find the output valuable when I'm trying to see what was
>>rebuilt (and the silencing valuable for make -s, too).
>
>
> Yes, agreed. Okay to commit to src/move-if-change, dear maintainers?
As Ian said - this patch (new version or old, but new version preferred)
is approved provided that it is also approved for gcc and checked in at
the same time.
Cheers
Nick
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Use $(SHELL) when running move-if-change
2004-12-21 2:32 ` Ian Lance Taylor
2004-12-21 3:20 ` Daniel Jacobowitz
@ 2004-12-21 21:05 ` DJ Delorie
1 sibling, 0 replies; 7+ messages in thread
From: DJ Delorie @ 2004-12-21 21:05 UTC (permalink / raw)
To: ian; +Cc: bje, binutils
> Personally I would just as soon keep the top level files in synch
> with gcc as much as possible. So, how about if it is accepted for
> gcc, it's OK for binutils?
GCC is in regressions-only mode, so I suspect cosmetic changes like
this would be discouraged until after they branch.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2004-12-21 21:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-20 21:22 Use $(SHELL) when running move-if-change Ian Lance Taylor
2004-12-20 23:49 ` Ben Elliston
2004-12-21 2:32 ` Ian Lance Taylor
2004-12-21 3:20 ` Daniel Jacobowitz
2004-12-21 5:16 ` Ben Elliston
2004-12-21 8:20 ` Nick Clifton
2004-12-21 21:05 ` DJ Delorie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).