From 09f2a9a7d2428fda96b584496f42ad5e69d3a20e Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 8 Aug 1999 17:37:50 +0000 Subject: [PATCH] * Makefile.am: Rename .dep* files to DEP*. Change DEP variable to MKDEP. Rebuild dependencies. * Makefile.in: Rebuild. --- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 38 +++++++++++++++++++------------------- ld/Makefile.in | 38 +++++++++++++++++++------------------- 3 files changed, 44 insertions(+), 38 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index d2b0e57c62..a69668e845 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +1999-08-08 Ian Lance Taylor + + * Makefile.am: Rename .dep* files to DEP*. Change DEP variable to + MKDEP. Rebuild dependencies. + * Makefile.in: Rebuild. + 1999-08-08 Jakub Jelinek * configure.host (sparc-*-linux-gnu*): New host. diff --git a/ld/Makefile.am b/ld/Makefile.am index 193409229b..3016a79e01 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -33,7 +33,7 @@ LIB_PATH = BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -DEP = mkdep +MKDEP = mkdep # What version of the manual to build DOCVER = gen @@ -742,7 +742,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 +CLEANFILES = dep.sed DEP DEP1 .PHONY: install-exec-local install-data-local @@ -777,37 +777,37 @@ distclean-local: rm -rf ldscripts # Targets to rebuild dependencies in this Makefile. -# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES). -.dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h - rm -f .dep1 - $(MAKE) DEP=$(DEP) .dep1 - sed -f dep.sed <.dep1 >.dep +# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES). +DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h + rm -f DEP1 + $(MAKE) MKDEP=$(MKDEP) DEP1 + sed -f dep.sed DEP # This rule really wants a mkdep that runs "gcc -MM". -.dep1: $(CFILES) $(GENERATED_CFILES) - rm -f .dep2 - echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2 - $(DEP) -f .dep2 $(INCLUDES) $? - $(srcdir)/../move-if-change .dep2 .dep1 +DEP1: $(CFILES) $(GENERATED_CFILES) + rm -f DEP2 + echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 + $(MKDEP) -f DEP2 $(INCLUDES) $? + $(srcdir)/../move-if-change DEP2 DEP1 dep.sed: dep-in.sed config.status sed <$(srcdir)/dep-in.sed >dep.sed \ -e 's!@INCDIR@!$(INCDIR)!' \ -e 's!@SRCDIR@!$(srcdir)!' -dep: .dep +dep: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile - cat .dep >> tmp-Makefile + cat DEP >> tmp-Makefile $(srcdir)/../move-if-change tmp-Makefile Makefile -dep-in: .dep +dep-in: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in - cat .dep >> tmp-Makefile.in + cat DEP >> tmp-Makefile.in $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in -dep-am: .dep +dep-am: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am - cat .dep >> tmp-Makefile.am + cat DEP >> tmp-Makefile.am $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am .PHONY: dep dep-in dep-am @@ -834,7 +834,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ $(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \ ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \ - ldctor.h ldfile.h $(INCDIR)/fnmatch.h + ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ $(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 7506e456f3..edbda16a22 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -134,7 +134,7 @@ LIB_PATH = BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -DEP = mkdep +MKDEP = mkdep # What version of the manual to build DOCVER = gen @@ -368,7 +368,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 +CLEANFILES = dep.sed DEP DEP1 # Stuff that should be included in a distribution. The diststuff # target is run by the taz target in ../Makefile.in. @@ -1458,37 +1458,37 @@ distclean-local: rm -rf ldscripts # Targets to rebuild dependencies in this Makefile. -# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES). -.dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h - rm -f .dep1 - $(MAKE) DEP=$(DEP) .dep1 - sed -f dep.sed <.dep1 >.dep +# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES). +DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h + rm -f DEP1 + $(MAKE) MKDEP=$(MKDEP) DEP1 + sed -f dep.sed DEP # This rule really wants a mkdep that runs "gcc -MM". -.dep1: $(CFILES) $(GENERATED_CFILES) - rm -f .dep2 - echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2 - $(DEP) -f .dep2 $(INCLUDES) $? - $(srcdir)/../move-if-change .dep2 .dep1 +DEP1: $(CFILES) $(GENERATED_CFILES) + rm -f DEP2 + echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 + $(MKDEP) -f DEP2 $(INCLUDES) $? + $(srcdir)/../move-if-change DEP2 DEP1 dep.sed: dep-in.sed config.status sed <$(srcdir)/dep-in.sed >dep.sed \ -e 's!@INCDIR@!$(INCDIR)!' \ -e 's!@SRCDIR@!$(srcdir)!' -dep: .dep +dep: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile - cat .dep >> tmp-Makefile + cat DEP >> tmp-Makefile $(srcdir)/../move-if-change tmp-Makefile Makefile -dep-in: .dep +dep-in: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in - cat .dep >> tmp-Makefile.in + cat DEP >> tmp-Makefile.in $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in -dep-am: .dep +dep-am: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am - cat .dep >> tmp-Makefile.am + cat DEP >> tmp-Makefile.am $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am .PHONY: dep dep-in dep-am @@ -1515,7 +1515,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ $(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \ ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \ - ldctor.h ldfile.h $(INCDIR)/fnmatch.h + ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ $(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \ -- 2.11.0