diff options
| author | Nick Clifton <nickc@redhat.com> | 2014-04-09 17:12:30 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2014-04-09 17:12:30 +0100 |
| commit | edf84efc4eae005d0e543e13cc51a751296e6aad (patch) | |
| tree | 5491250c55d989ea2ae3f9e9711b1563ce55e948 /ld/Makefile.am | |
| parent | 2eec7d5ba1928301955f4da013072c3e2f69f4a0 (diff) | |
| download | fsf-binutils-gdb-edf84efc4eae005d0e543e13cc51a751296e6aad.zip fsf-binutils-gdb-edf84efc4eae005d0e543e13cc51a751296e6aad.tar.gz fsf-binutils-gdb-edf84efc4eae005d0e543e13cc51a751296e6aad.tar.bz2 | |
Remove remaining default manifest support.
* Makefile.am (default-manifest.o): Remove rule.
(EMUL_EXTRA_BINARIES): Delete.
(ALL_EMUL_EXTRA_BINARIES): Delete.
(ld_new_DEPENDENCIES): Remove EMUL_EXTRA_BINARIES.
(install-data-local): Remove EMUL_EXTRA_BINARIES.
* Makefile.in: Regenerate.
* configure.in (all_emul_extra_binaries): Delete.
(EMUL_EXTRA_BINARIES): Remove.
* configure: Regenerate.
* configure.tgt (target_extra_binaries): Delete.
* emultempl/default-manifest.rc: Delete.
* ld.texinfo: Remove discussion of default manifest.
* emulparams/i386pe.sh (DEFAULT_MANIFEST): Delete.
* emulparams/i386pep.sh (DEFAULT_MANIFEST): Delete.
Diffstat (limited to 'ld/Makefile.am')
| -rw-r--r-- | ld/Makefile.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index 3e2dc1a..331e592 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -59,7 +59,6 @@ scriptdir = $(tooldir)/lib EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ EMUL_EXTRA_OFILES = @EMUL_EXTRA_OFILES@ -EMUL_EXTRA_BINARIES = @EMUL_EXTRA_BINARIES@ # Search path to override the default search path for -lfoo libraries. @@ -491,8 +490,6 @@ ALL_EMUL_EXTRA_OFILES = \ pe-dll.@OBJEXT@ \ pep-dll.@OBJEXT@ -ALL_EMUL_EXTRA_BINARIES = - CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ mri.c ldcref.c pe-dll.c pep-dll.c ldlex-wrapper.c \ @@ -1926,10 +1923,6 @@ eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} shlelf64_nbsd "$(tdir_shlelf64_nbsd)" -# Rule to create a manifest file for Cygwin and Mingw. -default-manifest.o: $(srcdir)/emultempl/default-manifest.rc - ${WINDRES_FOR_TARGET} -o $@ $< - # We need this for automake to use YLWRAP. EXTRA_ld_new_SOURCES = deffilep.y ldlex.l # Allow dependency tracking to work for these files, too. @@ -1938,7 +1931,7 @@ EXTRA_ld_new_SOURCES += pep-dll.c pe-dll.c ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c $(PLUGIN_C) \ ldbuildid.c -ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(EMUL_EXTRA_BINARIES) \ +ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \ $(BFDLIB) $(LIBIBERTY) $(LIBINTL_DEP) ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) @@ -2085,9 +2078,9 @@ install-exec-local: ld-new$(EXEEXT) install-binPROGRAMS fi; \ fi -install-data-local: $(EMUL_EXTRA_BINARIES) +install-data-local: $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts - for f in ldscripts/* $(EMUL_EXTRA_BINARIES); do \ + for f in ldscripts/* ; do \ $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \ done |