[committed] Wrong dependencies in ld/Makefile.am for ecriself.c, ed10velf.c, ei386moss.c

[Hans-Peter Nilsson]

While being good (well, trying to ;-) and testing the
export_dynamic change with --enable-all-targets, I noticed some
targets broke because of incorrectly listed dependencies.  They
depended on generic.em but used elf32.em and didn't catch up
with the change in elf32.em.  Dependency change committed as
obvious.

The D30V maintainer might want to check on ed30velf.  I spotted
semi-randomly that it actually uses generic.em by default; perhaps
a missing TEMPLATE_NAME setting in $(srcdir)/emulparams/d30velf.sh.
The natural choice seems elf32.em.  It doesn't state in
d30velf.sh why it's not using elf32.em "like everybody else".

BTW, the previous change to ld/Makefile.in seems to be a manual
tweak.  Please don't do that; let the dependencies generate
Makefile.in automatically through --enable-maintainer-mode.

ld:
	* Makefile.am (ecriself.c, ed10velf.c, ei386moss.c): Depend on
	$(srcdir)/emultempl/elf32.em, not $(srcdir)/emultempl/generic.em.
	* Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.61
diff -p -c -r1.61 Makefile.am
*** Makefile.am	2001/05/24 20:59:21	1.61
--- Makefile.am	2001/06/18 19:40:08
*************** ecrisaout.c: $(srcdir)/emulparams/crisao
*** 408,420 ****
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} crisaout "$(tdir_cris)"
  ecriself.c: $(srcdir)/emulparams/criself.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} criself "$(tdir_cris)"
  ecrislinux.c: $(srcdir)/emulparams/crislinux.sh \
    $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} crislinux "$(tdir_cris)"
  ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} d10velf "$(tdir_d10v)"
  ed30velf.c: $(srcdir)/emulparams/d30velf.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
--- 408,420 ----
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} crisaout "$(tdir_cris)"
  ecriself.c: $(srcdir)/emulparams/criself.sh \
!   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} criself "$(tdir_cris)"
  ecrislinux.c: $(srcdir)/emulparams/crislinux.sh \
    $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} crislinux "$(tdir_cris)"
  ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
!   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} d10velf "$(tdir_d10v)"
  ed30velf.c: $(srcdir)/emulparams/d30velf.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
*************** ei386mach.c: $(srcdir)/emulparams/i386ma
*** 617,623 ****
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} i386mach "$(tdir_i386mach)"
  ei386moss.c: $(srcdir)/emulparams/i386moss.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} i386moss "$(tdir_i386moss)"
  ei386msdos.c: $(srcdir)/emulparams/i386msdos.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386msdos.sc ${GEN_DEPENDS}
--- 617,623 ----
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} i386mach "$(tdir_i386mach)"
  ei386moss.c: $(srcdir)/emulparams/i386moss.sh \
!   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} i386moss "$(tdir_i386moss)"
  ei386msdos.c: $(srcdir)/emulparams/i386msdos.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386msdos.sc ${GEN_DEPENDS}

brgds, H-P