From 0bdaf48bac96b318feed22ef57035b06133fcf2f Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 1 Jul 2000 01:41:09 +0000 Subject: [PATCH] Fix 2000-06-22. grep after running dep.sed --- bfd/ChangeLog | 6 ++++++ bfd/Makefile.am | 9 +++++---- bfd/Makefile.in | 9 +++++---- binutils/ChangeLog | 6 ++++++ binutils/Makefile.am | 9 +++++---- binutils/Makefile.in | 9 +++++---- gprof/ChangeLog | 6 ++++++ gprof/Makefile.am | 9 +++++---- gprof/Makefile.in | 9 +++++---- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 9 +++++---- ld/Makefile.in | 9 +++++---- opcodes/ChangeLog | 6 ++++++ opcodes/Makefile.am | 9 +++++---- opcodes/Makefile.in | 9 +++++---- 15 files changed, 80 insertions(+), 40 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cb7a27ade8c..7ebf8fa23f1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 Alan Modra + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-30 DJ Delorie * peicode.h (coff_swap_filehdr_in): can't use e_magic because we diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 114a6266d61..6d408a3ec3f 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 7b31b59c962..19b06cb6f38 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) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 44ee5dc392d..717e27bdb0c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 Alan Modra + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-27 Alan Modra * ar.c: Revert incorrect 2000-06-25 patch. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index c3b09cd48e8..9c3139a1b08 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -287,11 +287,12 @@ DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \ DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_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) $(GENERATED_CFILES) @@ -346,7 +347,7 @@ MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \ mostlyclean-local: -rm -rf tmpdir -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 .PHONY: install-exec-local diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 7e51ccce7d3..5f114692444 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -300,7 +300,7 @@ MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \ abcdefgh* -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h @@ -1150,11 +1150,12 @@ diststuff: $(DISTSTUFF) info DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_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) $(GENERATED_CFILES) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 06723ca8d84..1b5e8fb5471 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 Alan Modra + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-22 Alan Modra * Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we diff --git a/gprof/Makefile.am b/gprof/Makefile.am index d380ce58930..50d787b0e21 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -57,11 +57,12 @@ man_MANS = gprof.1 DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.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: $(gprof_SOURCES) @@ -95,7 +96,7 @@ dep-am: DEP .PHONY: dep dep-in dep-am -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/gprof/Makefile.in b/gprof/Makefile.in index af7ea2f2bd6..7880de88e78 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -138,7 +138,7 @@ POTFILES = $(sources) $(noinst_HEADERS) info_TEXINFOS = gprof.texi man_MANS = gprof.1 -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = gconfig.h @@ -706,11 +706,12 @@ po/POTFILES.in: @MAINT@ Makefile DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.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: $(gprof_SOURCES) diff --git a/ld/ChangeLog b/ld/ChangeLog index 97360fd8818..e3dbbea68d2 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 Alan Modra + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-30 Timothy Wall * scripttempl/tic54xcoff.sc: PAGE N is not implemented, so encode diff --git a/ld/Makefile.am b/ld/Makefile.am index beb6580e153..cbb15035527 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -853,7 +853,7 @@ MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum mostlyclean-local: -rm -rf tmpdir -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 .PHONY: install-exec-local install-data-local @@ -892,11 +892,12 @@ distclean-local: DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_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) $(GENERATED_CFILES) diff --git a/ld/Makefile.in b/ld/Makefile.in index 1ecd9201b73..662da17ddb3 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -396,7 +396,7 @@ MAINTAINERCLEANFILES = ldver.texi MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum -CLEANFILES = dep.sed DEP DEP1 DEP2 +CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 # Stuff that should be included in a distribution. The diststuff # target is run by the taz target in ../Makefile.in. @@ -1571,11 +1571,12 @@ distclean-local: DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_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) $(GENERATED_CFILES) 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 + + * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed + (CLEANFILES): Add DEPA. + * Makefile.in: Regenerate. + 2000-06-26 Scott Bambrough * 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)