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 /bfd | |
| parent | 9b443040f82ecf46cfec9d18b9d1ed2d487c53d5 (diff) | |
| download | gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.zip gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.tar.gz gdb-0bdaf48bac96b318feed22ef57035b06133fcf2f.tar.bz2 | |
Fix 2000-06-22. grep after running dep.sed
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/Makefile.am | 9 | ||||
| -rw-r--r-- | bfd/Makefile.in | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cb7a27a..7ebf8fa 100644 --- a/bfd/ChangeLog +++ b/bfd/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-30 DJ Delorie <dj@cygnus.com> * peicode.h (coff_swap_filehdr_in): can't use e_magic because we diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 114a626..6d408a3 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -576,11 +576,12 @@ install-data-local: $(BFD_H) DEP: dep.sed $(CFILES) $(HFILES) bfd.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) @@ -670,7 +671,7 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \ targmatch.h -CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEP1 DEP2 libbfd.a stamp-lib \ +CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ stmp-bin2-h stmp-lbfd-h stmp-lcoff-h # We want to rerun configure if config.bfd or configure.host change. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 7b31b59..19b06cb 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -637,7 +637,7 @@ MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \ targmatch.h -CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEP1 DEP2 libbfd.a stamp-lib \ +CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ stmp-bin2-h stmp-lbfd-h stmp-lcoff-h ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -1116,11 +1116,12 @@ install-data-local: $(BFD_H) DEP: dep.sed $(CFILES) $(HFILES) bfd.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) |