diff options
| author | Alan Modra <amodra@gmail.com> | 2000-07-01 01:41:09 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2000-07-01 01:41:09 +0000 |
| commit | 0bdaf48bac96b318feed22ef57035b06133fcf2f (patch) | |
| tree | e8928b9d365d067eba6e374fd61c32266caf24eb /opcodes | |
| parent | 9b443040f82ecf46cfec9d18b9d1ed2d487c53d5 (diff) | |
| download | binutils-gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.tar.gz | |
Fix 2000-06-22. grep after running dep.sed
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 9 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index fa7104a2061..8be6f0cbec9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 Alan Modra <alan@linuxcare.com.au> + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-26 Scott Bambrough <scottb@netwinder.org> * arm-dis.c (regnames): Add an additional register set to match diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index f4af0468a9c..8030fe88e9b 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -219,7 +219,7 @@ config.status: $(srcdir)/configure $(srcdir)/../bfd/configure.in $(SHELL) ./config.status --recheck CLEANFILES = \ - libopcodes.a stamp-lib dep.sed DEP DEP1 DEP2 + libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2 @@ -250,11 +250,12 @@ ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.t DEP: dep.sed $(CFILES) $(HFILES) config.h rm -f DEP1 $(MAKE) MKDEP="$(MKDEP)" DEP1 - if grep ' /' DEP1 > /dev/null 2> /dev/null; then \ + sed -f dep.sed < DEP1 > DEPA + echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA + if grep ' /' DEPA > /dev/null 2> /dev/null; then \ echo 'make DEP failed!'; exit 1; \ else \ - sed -f dep.sed < DEP1 > $@; \ - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \ + mv -f DEPA $@; \ fi DEP1: $(CFILES) diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index d189e6aab27..086f5c7ecf3 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -304,7 +304,7 @@ noinst_LIBRARIES = libopcodes.a POTFILES = $(HFILES) $(CFILES) CLEANFILES = \ - libopcodes.a stamp-lib dep.sed DEP DEP1 DEP2 + libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -748,11 +748,12 @@ ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.t DEP: dep.sed $(CFILES) $(HFILES) config.h rm -f DEP1 $(MAKE) MKDEP="$(MKDEP)" DEP1 - if grep ' /' DEP1 > /dev/null 2> /dev/null; then \ + sed -f dep.sed < DEP1 > DEPA + echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA + if grep ' /' DEPA > /dev/null 2> /dev/null; then \ echo 'make DEP failed!'; exit 1; \ else \ - sed -f dep.sed < DEP1 > $@; \ - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \ + mv -f DEPA $@; \ fi DEP1: $(CFILES) |