From d32820f2fa29322c86fa03a662b114ecdfd0e28e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 2 Oct 2001 06:04:23 +0000 Subject: [PATCH] * ldver.h (ld_program_version): Remove declaration. * lexsup.c (parse_args): Move printing of copyright message.. * ldver.c (ldversion): .. to here. Use BFD_VERSION_STRING in place of BFD_VERSION. (ld_program_version): Remove. * Makefile.am (Makefile): Depend on bfd/configure.in Run "make dep-am" * Makefile.in: Regenerate. --- ld/ChangeLog | 11 +++++ ld/Makefile.am | 117 ++++++++++++++++++++++++++----------------------- ld/Makefile.in | 117 ++++++++++++++++++++++++++----------------------- ld/ldver.c | 18 +++++--- ld/ldver.h | 2 - ld/lexsup.c | 17 +------ 6 files changed, 146 insertions(+), 136 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index a07c6dafdc..05a9f26f7d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,14 @@ +2001-10-02 Alan Modra + + * ldver.h (ld_program_version): Remove declaration. + * lexsup.c (parse_args): Move printing of copyright message.. + * ldver.c (ldversion): .. to here. + Use BFD_VERSION_STRING in place of BFD_VERSION. + (ld_program_version): Remove. + * Makefile.am (Makefile): Depend on bfd/configure.in. + Run "make dep-am". + * Makefile.in: Regenerate. + 2001-09-30 Hans-Peter Nilsson * Makefile.am: Update dependencies with "make dep-am". diff --git a/ld/Makefile.am b/ld/Makefile.am index 8cdf8c958c..ec617f1cbd 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -1012,6 +1012,8 @@ DISTCLEANFILES = tdirs site.exp site.bak stringify.sed distclean-local: rm -rf ldscripts +Makefile: $(BFDDIR)/configure.in + # 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 @@ -1058,74 +1060,77 @@ dep-am: DEP # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. ldctor.o: ldctor.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \ - ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \ + ldexp.h ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h ldemul.o: ldemul.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ - ldmisc.h ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h \ - ldemul-list.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + ld.h $(INCDIR)/bin-bugs.h ldmisc.h ldexp.h ldlang.h \ + ldfile.h ldemul.h ldmain.h ldemul-list.h ldexp.o: ldexp.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldexp.h \ - ldgram.h ldlang.h $(INCDIR)/libiberty.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ + ldmisc.h ldexp.h ldgram.h ldlang.h $(INCDIR)/libiberty.h ldfile.o: ldfile.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ - ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h ldlex.h \ - ldemul.h $(INCDIR)/libiberty.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \ + ldmisc.h ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h \ + ldlex.h ldemul.h $(INCDIR)/libiberty.h ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h $(INCDIR)/bfdlink.h \ - ld.h $(INCDIR)/bin-bugs.h ldmain.h ldgram.h ldexp.h \ - ldlang.h ldlex.h ldmisc.h ldctor.h ldfile.h ldemul.h \ - $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \ + $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ + ldgram.h ldexp.h ldlang.h ldlex.h ldmisc.h ldctor.h \ + ldfile.h ldemul.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)/safe-ctype.h \ - $(INCDIR)/libiberty.h $(INCDIR)/progress.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/filenames.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ - ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h ldlex.h \ - ldfile.h ldemul.h ldctor.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h $(INCDIR)/bin-bugs.h \ + ldmain.h ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h \ + ldlex.h ldfile.h ldemul.h ldctor.h ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/demangle.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ - ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h ldfile.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/libiberty.h $(INCDIR)/demangle.h ld.h $(INCDIR)/bin-bugs.h \ + ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h \ + ldfile.h ldver.o: ldver.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ - ldver.h ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + ld.h $(INCDIR)/bin-bugs.h ldver.h ldexp.h ldlang.h \ + ldfile.h ldemul.h ldmain.h ldwrite.o: ldwrite.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \ - ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h \ + ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h lexsup.o: lexsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \ - ldmain.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h \ - ldfile.h ldver.h ldemul.h $(INCDIR)/demangle.h -mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h sysdep.h \ - config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h \ + ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldexp.h \ + ldlang.h ldgram.h ldlex.h ldfile.h ldver.h ldemul.h \ + $(INCDIR)/demangle.h +mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ + sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ ldexp.h ldlang.h ldmisc.h mri.h ldgram.h $(INCDIR)/libiberty.h ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ - ldmisc.h ldexp.h ldlang.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h \ + ldmain.h ldmisc.h ldexp.h ldlang.h pe-dll.o: pe-dll.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \ - ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h \ - ldfile.h ldemul.h $(INCDIR)/coff/internal.h ../bfd/libcoff.h \ - deffile.h pe-dll.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \ + ld.h $(INCDIR)/bin-bugs.h ldexp.h ldlang.h ldwrite.h \ + ldmisc.h ldgram.h ldmain.h ldfile.h ldemul.h $(INCDIR)/coff/internal.h \ + ../bfd/libcoff.h deffile.h pe-dll.h ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - ld.h $(INCDIR)/bin-bugs.h ldexp.h ldver.h ldlang.h \ - ldfile.h ldemul.h ldmisc.h ldmain.h mri.h ldctor.h \ - ldlex.h -ldlex.o: ldlex.c ../bfd/bfd.h sysdep.h config.h $(INCDIR)/fopen-same.h \ - $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldgram.h \ - ldmisc.h ldexp.h ldlang.h ldfile.h ldlex.h ldmain.h \ - $(INCDIR)/libiberty.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \ + ldver.h ldlang.h ldfile.h ldemul.h ldmisc.h ldmain.h \ + mri.h ldctor.h ldlex.h +ldlex.o: ldlex.c ../bfd/bfd.h $(INCDIR)/symcat.h sysdep.h \ + config.h $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \ + ld.h $(INCDIR)/bin-bugs.h ldgram.h ldmisc.h ldexp.h \ + ldlang.h ldfile.h ldlex.h ldmain.h $(INCDIR)/libiberty.h deffilep.o: deffilep.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/safe-ctype.h ../bfd/bfd.h sysdep.h config.h \ - $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ - deffile.h + $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \ + sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ + ldmisc.h deffile.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ld/Makefile.in b/ld/Makefile.in index a6dbcd0754..77f94c7463 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1703,6 +1703,8 @@ diststuff: info $(EXTRA_DIST) distclean-local: rm -rf ldscripts +Makefile: $(BFDDIR)/configure.in + # 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 @@ -1749,76 +1751,79 @@ dep-am: DEP # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. ldctor.o: ldctor.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \ - ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \ + ldexp.h ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h ldemul.o: ldemul.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ - ldmisc.h ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h \ - ldemul-list.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + ld.h $(INCDIR)/bin-bugs.h ldmisc.h ldexp.h ldlang.h \ + ldfile.h ldemul.h ldmain.h ldemul-list.h ldexp.o: ldexp.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldexp.h \ - ldgram.h ldlang.h $(INCDIR)/libiberty.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ + ldmisc.h ldexp.h ldgram.h ldlang.h $(INCDIR)/libiberty.h ldfile.o: ldfile.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ - ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h ldlex.h \ - ldemul.h $(INCDIR)/libiberty.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \ + ldmisc.h ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h \ + ldlex.h ldemul.h $(INCDIR)/libiberty.h ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h $(INCDIR)/bfdlink.h \ - ld.h $(INCDIR)/bin-bugs.h ldmain.h ldgram.h ldexp.h \ - ldlang.h ldlex.h ldmisc.h ldctor.h ldfile.h ldemul.h \ - $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \ + $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ + ldgram.h ldexp.h ldlang.h ldlex.h ldmisc.h ldctor.h \ + ldfile.h ldemul.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)/safe-ctype.h \ - $(INCDIR)/libiberty.h $(INCDIR)/progress.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/filenames.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ - ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h ldlex.h \ - ldfile.h ldemul.h ldctor.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h $(INCDIR)/bin-bugs.h \ + ldmain.h ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h \ + ldlex.h ldfile.h ldemul.h ldctor.h ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/demangle.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ - ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h ldfile.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/libiberty.h $(INCDIR)/demangle.h ld.h $(INCDIR)/bin-bugs.h \ + ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h \ + ldfile.h ldver.o: ldver.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ - ldver.h ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + ld.h $(INCDIR)/bin-bugs.h ldver.h ldexp.h ldlang.h \ + ldfile.h ldemul.h ldmain.h ldwrite.o: ldwrite.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \ - ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h \ + ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h lexsup.o: lexsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \ - $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \ - ldmain.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h \ - ldfile.h ldver.h ldemul.h $(INCDIR)/demangle.h -mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h sysdep.h \ - config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h \ + ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldexp.h \ + ldlang.h ldgram.h ldlex.h ldfile.h ldver.h ldemul.h \ + $(INCDIR)/demangle.h +mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ + sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ ldexp.h ldlang.h ldmisc.h mri.h ldgram.h $(INCDIR)/libiberty.h ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \ - ldmisc.h ldexp.h ldlang.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h \ + ldmain.h ldmisc.h ldexp.h ldlang.h pe-dll.o: pe-dll.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \ - ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h \ - ldfile.h ldemul.h $(INCDIR)/coff/internal.h ../bfd/libcoff.h \ - deffile.h pe-dll.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \ + ld.h $(INCDIR)/bin-bugs.h ldexp.h ldlang.h ldwrite.h \ + ldmisc.h ldgram.h ldmain.h ldfile.h ldemul.h $(INCDIR)/coff/internal.h \ + ../bfd/libcoff.h deffile.h pe-dll.h ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ - ld.h $(INCDIR)/bin-bugs.h ldexp.h ldver.h ldlang.h \ - ldfile.h ldemul.h ldmisc.h ldmain.h mri.h ldctor.h \ - ldlex.h -ldlex.o: ldlex.c ../bfd/bfd.h sysdep.h config.h $(INCDIR)/fopen-same.h \ - $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldgram.h \ - ldmisc.h ldexp.h ldlang.h ldfile.h ldlex.h ldmain.h \ - $(INCDIR)/libiberty.h + $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \ + ldver.h ldlang.h ldfile.h ldemul.h ldmisc.h ldmain.h \ + mri.h ldctor.h ldlex.h +ldlex.o: ldlex.c ../bfd/bfd.h $(INCDIR)/symcat.h sysdep.h \ + config.h $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \ + ld.h $(INCDIR)/bin-bugs.h ldgram.h ldmisc.h ldexp.h \ + ldlang.h ldfile.h ldlex.h ldmain.h $(INCDIR)/libiberty.h deffilep.o: deffilep.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/safe-ctype.h ../bfd/bfd.h sysdep.h config.h \ - $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \ - deffile.h + $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \ + sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \ + ldmisc.h deffile.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/ld/ldver.c b/ld/ldver.c index a50b5480c4..d2a1c3feac 100644 --- a/ld/ldver.c +++ b/ld/ldver.c @@ -1,5 +1,5 @@ /* ldver.c -- Print linker version. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -30,16 +30,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "ldemul.h" #include "ldmain.h" -const char *ld_program_version = VERSION; - void ldversion (noisy) int noisy; { - fprintf (stdout, _("GNU ld version %s (with BFD %s)\n"), - ld_program_version, BFD_VERSION); + /* Output for noisy == 2 is intended to follow the GNU standards. */ + fprintf (stdout, _("GNU ld version %s\n"), BFD_VERSION_STRING); - if (noisy) + if (noisy & 2) + { + printf (_("Copyright 2001 Free Software Foundation, Inc.\n")); + printf (_("\ +This program is free software; you may redistribute it under the terms of\n\ +the GNU General Public License. This program has absolutely no warranty.\n")); + } + + if (noisy & 1) { ld_emulation_xfer_type **ptr = ld_emulations; diff --git a/ld/ldver.h b/ld/ldver.h index a5ba624d9f..ef06937467 100644 --- a/ld/ldver.h +++ b/ld/ldver.h @@ -17,6 +17,4 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -extern const char *ld_program_version; - void ldversion PARAMS ((int)); diff --git a/ld/lexsup.c b/ld/lexsup.c index 70e9017f1b..46f397ca48 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -1003,22 +1003,7 @@ parse_args (argc, argv) version_printed = true; break; case OPTION_VERSION: - /* This output is intended to follow the GNU standards document. */ - printf ("GNU ld %s\n", ld_program_version); - printf (_("Copyright 2001 Free Software Foundation, Inc.\n")); - printf (_("\ -This program is free software; you may redistribute it under the terms of\n\ -the GNU General Public License. This program has absolutely no warranty.\n")); - { - ld_emulation_xfer_type **ptr = ld_emulations; - - printf (_(" Supported emulations:\n")); - while (*ptr) - { - printf (" %s\n", (*ptr)->emulation_name); - ptr++; - } - } + ldversion (2); xexit (0); break; case OPTION_VERSION_SCRIPT: