diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/Makefile.am | 9 | ||||
| -rw-r--r-- | ld/Makefile.in | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 97360fd..e3dbbea 100644 --- a/ld/ChangeLog +++ b/ld/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 Timothy Wall <twall@ppc> * scripttempl/tic54xcoff.sc: PAGE N is not implemented, so encode diff --git a/ld/Makefile.am b/ld/Makefile.am index beb6580..cbb1503 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 1ecd920..662da17 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) |