2001-01-21 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
authorAndreas Jaeger <aj@suse.de>
Mon, 22 Jan 2001 09:41:40 +0000 (09:41 +0000)
committerAndreas Jaeger <aj@suse.de>
Mon, 22 Jan 2001 09:41:40 +0000 (09:41 +0000)
* Makefile.am (install-data-local): Make use of $(DESTDIR).
* Makefile.in: Regenerate.

bfd/ChangeLog
bfd/Makefile.am
bfd/Makefile.in

index 4ea800ce61cf89d8786a50fe03f8ab5b6232972d..594893bcd7fec619a75a427ee5d9ee9f0ca21878 100644 (file)
@@ -1,3 +1,8 @@
+2001-01-21  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+       * Makefile.am (install-data-local): Make use of $(DESTDIR).
+       * Makefile.in: Regenerate.
+
 2001-01-21  Kazu Hirata  <kazu@hxi.com>
 
        * coff-a29k.c: Fix formatting.
index 435b706ccda4b02c8ce51beda1aa432ab2147ec0..b6741bc0173aebac67b0bd749f6aebb98536e99f 100644 (file)
@@ -588,10 +588,11 @@ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
 # Install BFD include file, and others that it needs.
 install-data-local: $(BFD_H)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(includedir)
-       $(INSTALL_DATA) $(BFD_H) $(includedir)/bfd.h
-       $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
-       $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
+       $(mkinstalldirs) $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(includedir)/bfd.h
+       $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(DESTDIR)$(includedir)/ansidecl.h
+       $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(DESTDIR)$(includedir)/bfdlink.h
+
 
 # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
 DEP: dep.sed $(CFILES) $(HFILES) bfd.h
index 9c41c79d487fc21925efeea4d9a4d041f95f4204..0c60c1c78df888dc054d9896c3c11b3e39b8c594 100644 (file)
@@ -144,448 +144,41 @@ BFD_H = bfd.h
 # for the debugger, so if you are downloading things as S-records you
 # need two copies of the executable, one to download and one for the
 # debugger).
-BFD_LIBS = \
-       archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo \
-       format.lo init.lo libbfd.lo opncls.lo reloc.lo \
-       section.lo syms.lo targets.lo hash.lo linker.lo \
-       srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
-       dwarf2.lo
+BFD_LIBS =     archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo   format.lo init.lo libbfd.lo opncls.lo reloc.lo  section.lo syms.lo targets.lo hash.lo linker.lo         srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo       dwarf2.lo
 
 
-BFD_LIBS_CFILES = \
-       archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
-       format.c init.c libbfd.c opncls.c reloc.c \
-       section.c syms.c targets.c hash.c linker.c \
-       srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
-       dwarf2.c
+BFD_LIBS_CFILES =      archive.c archures.c bfd.c cache.c coffgen.c corefile.c         format.c init.c libbfd.c opncls.c reloc.c       section.c syms.c targets.c hash.c linker.c      srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c     dwarf2.c
 
 
 # This list is alphabetized to make it easier to keep in sync
 # with the decls and initializer in archures.c.
-ALL_MACHINES = \
-       cpu-a29k.lo \
-       cpu-alpha.lo \
-       cpu-arc.lo \
-       cpu-arm.lo \
-       cpu-avr.lo \
-       cpu-cris.lo \
-       cpu-d10v.lo \
-       cpu-d30v.lo \
-       cpu-fr30.lo \
-       cpu-h8300.lo \
-       cpu-h8500.lo \
-       cpu-hppa.lo \
-       cpu-ia64.lo \
-       cpu-i370.lo \
-       cpu-i386.lo \
-       cpu-i860.lo \
-       cpu-i960.lo \
-       cpu-m32r.lo \
-       cpu-m68hc11.lo \
-       cpu-m68hc12.lo \
-       cpu-m68k.lo \
-       cpu-m88k.lo \
-       cpu-m10200.lo \
-       cpu-m10300.lo \
-       cpu-mcore.lo \
-       cpu-mips.lo \
-       cpu-ns32k.lo \
-       cpu-pj.lo \
-       cpu-powerpc.lo \
-       cpu-rs6000.lo \
-       cpu-sh.lo \
-       cpu-sparc.lo \
-       cpu-tic30.lo \
-       cpu-tic54x.lo \
-       cpu-tic80.lo \
-       cpu-v850.lo \
-       cpu-vax.lo \
-       cpu-we32k.lo \
-       cpu-w65.lo \
-       cpu-z8k.lo
-
-
-ALL_MACHINES_CFILES = \
-       cpu-a29k.c \
-       cpu-alpha.c \
-       cpu-arc.c \
-       cpu-arm.c \
-       cpu-avr.c \
-       cpu-cris.c \
-       cpu-d10v.c \
-       cpu-d30v.c \
-       cpu-fr30.c \
-       cpu-h8300.c \
-       cpu-h8500.c \
-       cpu-hppa.c \
-       cpu-ia64.c \
-       cpu-i370.c \
-       cpu-i386.c \
-       cpu-i860.c \
-       cpu-i960.c \
-       cpu-m32r.c \
-       cpu-m68hc11.c \
-       cpu-m68hc12.c \
-       cpu-m68k.c \
-       cpu-m88k.c \
-       cpu-m10200.c \
-       cpu-m10300.c \
-       cpu-mcore.c \
-       cpu-mips.c \
-       cpu-ns32k.c \
-       cpu-pj.c \
-       cpu-powerpc.c \
-       cpu-rs6000.c \
-       cpu-sh.c \
-       cpu-sparc.c \
-       cpu-tic30.c \
-       cpu-tic54x.c \
-       cpu-tic80.c \
-       cpu-v850.c \
-       cpu-vax.c \
-       cpu-we32k.c \
-       cpu-w65.c \
-       cpu-z8k.c
+ALL_MACHINES =         cpu-a29k.lo     cpu-alpha.lo    cpu-arc.lo      cpu-arm.lo      cpu-avr.lo      cpu-cris.lo     cpu-d10v.lo     cpu-d30v.lo     cpu-fr30.lo     cpu-h8300.lo    cpu-h8500.lo    cpu-hppa.lo     cpu-ia64.lo     cpu-i370.lo     cpu-i386.lo     cpu-i860.lo     cpu-i960.lo     cpu-m32r.lo     cpu-m68hc11.lo  cpu-m68hc12.lo  cpu-m68k.lo     cpu-m88k.lo     cpu-m10200.lo   cpu-m10300.lo   cpu-mcore.lo    cpu-mips.lo     cpu-ns32k.lo    cpu-pj.lo       cpu-powerpc.lo  cpu-rs6000.lo   cpu-sh.lo       cpu-sparc.lo    cpu-tic30.lo    cpu-tic54x.lo   cpu-tic80.lo    cpu-v850.lo     cpu-vax.lo      cpu-we32k.lo    cpu-w65.lo      cpu-z8k.lo
+
+
+ALL_MACHINES_CFILES =          cpu-a29k.c      cpu-alpha.c     cpu-arc.c       cpu-arm.c       cpu-avr.c       cpu-cris.c      cpu-d10v.c      cpu-d30v.c      cpu-fr30.c      cpu-h8300.c     cpu-h8500.c     cpu-hppa.c      cpu-ia64.c      cpu-i370.c      cpu-i386.c      cpu-i860.c      cpu-i960.c      cpu-m32r.c      cpu-m68hc11.c   cpu-m68hc12.c   cpu-m68k.c      cpu-m88k.c      cpu-m10200.c    cpu-m10300.c    cpu-mcore.c     cpu-mips.c      cpu-ns32k.c     cpu-pj.c        cpu-powerpc.c   cpu-rs6000.c    cpu-sh.c        cpu-sparc.c     cpu-tic30.c     cpu-tic54x.c    cpu-tic80.c     cpu-v850.c      cpu-vax.c       cpu-we32k.c     cpu-w65.c       cpu-z8k.c
 
 
 # The .o files needed by all of the 32 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all.
-BFD32_BACKENDS = \
-       aout-adobe.lo \
-       aout-arm.lo \
-       aout-cris.lo \
-       aout-ns32k.lo \
-       aout-sparcle.lo \
-       aout-tic30.lo \
-       aout0.lo \
-       aout32.lo \
-       armnetbsd.lo \
-       bout.lo \
-       cf-i386lynx.lo \
-       cf-m68klynx.lo \
-       cf-sparclynx.lo \
-       coff-a29k.lo \
-       coff-apollo.lo \
-       coff-arm.lo \
-       coff-aux.lo \
-       coff-h8300.lo \
-       coff-h8500.lo \
-       coff-i386.lo \
-       coff-go32.lo \
-       coff-i860.lo \
-       coff-i960.lo \
-       coff-m68k.lo \
-       coff-m88k.lo \
-       coff-mips.lo \
-       coff-pmac.lo \
-       coff-rs6000.lo \
-       coff-sh.lo \
-       coff-sparc.lo \
-       coff-stgo32.lo \
-       coff-svm68k.lo \
-       coff-tic30.lo \
-       coff-tic54x.lo \
-       coff-tic80.lo \
-       coff-u68k.lo \
-       coff-we32k.lo \
-       coff-w65.lo \
-       coff-z8k.lo \
-       cofflink.lo \
-       dwarf1.lo \
-       ecoff.lo \
-       ecofflink.lo \
-       efi-app-ia32.lo \
-       elf.lo \
-       elf32-arc.lo \
-       elfarm-oabi.lo \
-       elfarm-nabi.lo \
-       elf32-avr.lo \
-       elf32-cris.lo \
-       elf32-d10v.lo \
-       elf32-d30v.lo \
-       elf32-fr30.lo \
-       elf32-gen.lo \
-       elf32-hppa.lo \
-       elf32-i370.lo \
-       elf32-i386.lo \
-       elf32-i860.lo \
-       elf32-i960.lo \
-       elf32-ia64.lo \
-       elf32-m32r.lo \
-       elf32-m68hc11.lo \
-       elf32-m68hc12.lo \
-       elf32-m68k.lo \
-       elf32-m88k.lo \
-       elf-m10200.lo \
-       elf-m10300.lo \
-       elf32-mcore.lo \
-       elf32-mips.lo \
-       elf32-pj.lo \
-       elf32-ppc.lo \
-       elf32-sh.lo \
-       elf32-sh-lin.lo \
-       elf32-sparc.lo \
-       elf32-v850.lo \
-       elf32.lo \
-       elflink.lo \
-       epoc-pe-arm.lo \
-       epoc-pei-arm.lo \
-       hp300bsd.lo \
-       hp300hpux.lo \
-       som.lo \
-       i386aout.lo \
-       i386bsd.lo \
-       i386dynix.lo \
-       i386freebsd.lo \
-       i386linux.lo \
-       i386lynx.lo \
-       i386msdos.lo \
-       i386netbsd.lo \
-       i386mach3.lo \
-       i386os9k.lo \
-       ieee.lo \
-       m68k4knetbsd.lo \
-       m68klinux.lo \
-       m68klynx.lo \
-       m68knetbsd.lo \
-       m88kmach3.lo \
-       mipsbsd.lo \
-       newsos3.lo \
-       nlm.lo \
-       nlm32-i386.lo \
-       nlm32-sparc.lo \
-       nlm32-ppc.lo \
-       nlm32.lo \
-       ns32knetbsd.lo \
-       oasys.lo \
-       pc532-mach.lo \
-       pe-arm.lo \
-       pei-arm.lo \
-       pe-i386.lo \
-       pei-i386.lo \
-       pe-mcore.lo \
-       pei-mcore.lo \
-       pe-ppc.lo \
-       pei-ppc.lo \
-       pe-sh.lo \
-       pei-sh.lo \
-       pe-mips.lo \
-       pei-mips.lo \
-       peigen.lo \
-       ppcboot.lo \
-       reloc16.lo \
-       riscix.lo \
-       sparclinux.lo \
-       sparclynx.lo \
-       sparcnetbsd.lo \
-       sunos.lo \
-       vaxnetbsd.lo \
-       versados.lo \
-       vms.lo \
-       vms-gsd.lo \
-       vms-hdr.lo \
-       vms-misc.lo \
-       vms-tir.lo \
-       xcofflink.lo
-
-
-BFD32_BACKENDS_CFILES = \
-       aout-adobe.c \
-       aout-arm.c \
-       aout-cris.c \
-       aout-ns32k.c \
-       aout-sparcle.c \
-       aout-tic30.c \
-       aout0.c \
-       aout32.c \
-       armnetbsd.c \
-       bout.c \
-       cf-i386lynx.c \
-       cf-m68klynx.c \
-       cf-sparclynx.c \
-       coff-a29k.c \
-       coff-apollo.c \
-       coff-arm.c \
-       coff-aux.c \
-       coff-h8300.c \
-       coff-h8500.c \
-       coff-i386.c \
-       coff-i860.c \
-       coff-go32.c \
-       coff-i960.c \
-       coff-m68k.c \
-       coff-m88k.c \
-       coff-mips.c \
-       coff-pmac.c \
-       coff-rs6000.c \
-       coff-sh.c \
-       coff-sparc.c \
-       coff-stgo32.c \
-       coff-svm68k.c \
-       coff-tic30.c \
-       coff-tic54x.c \
-       coff-tic80.c \
-       coff-u68k.c \
-       coff-we32k.c \
-       coff-w65.c \
-       coff-z8k.c \
-       cofflink.c \
-       dwarf1.c \
-       ecoff.c \
-       ecofflink.c \
-       efi-app-ia32.c \
-       elf.c \
-       elf32-arc.c \
-       elfarm-oabi.c \
-       elfarm-nabi.c \
-       elf32-avr.c \
-       elf32-cris.c \
-       elf32-d10v.c \
-       elf32-d30v.c \
-       elf32-fr30.c \
-       elf32-gen.c \
-       elf32-hppa.c \
-       elf32-i370.c \
-       elf32-i386.c \
-       elf32-i860.c \
-       elf32-i960.c \
-       elf32-m32r.c \
-       elf32-m68k.c \
-       elf32-m68hc11.c \
-       elf32-m68hc12.c \
-       elf32-m88k.c \
-       elf-m10200.c \
-       elf-m10300.c \
-       elf32-mcore.c \
-       elf32-mips.c \
-       elf32-pj.c \
-       elf32-ppc.c \
-       elf32-sh.c \
-       elf32-sh-lin.c \
-       elf32-sparc.c \
-       elf32-v850.c \
-       elf32.c \
-       elflink.c \
-       epoc-pe-arm.c \
-       epoc-pei-arm.c \
-       hp300bsd.c \
-       hp300hpux.c \
-       som.c \
-       i386aout.c \
-       i386bsd.c \
-       i386dynix.c \
-       i386freebsd.c \
-       i386linux.c \
-       i386lynx.c \
-       i386msdos.c \
-       i386netbsd.c \
-       i386mach3.c \
-       i386os9k.c \
-       ieee.c \
-       m68k4knetbsd.c \
-       m68klinux.c \
-       m68klynx.c \
-       m68knetbsd.c \
-       m88kmach3.c \
-       mipsbsd.c \
-       newsos3.c \
-       nlm.c \
-       nlm32-i386.c \
-       nlm32-sparc.c \
-       nlm32-ppc.c \
-       nlm32.c \
-       ns32knetbsd.c \
-       oasys.c \
-       pc532-mach.c \
-       pe-arm.c \
-       pei-arm.c \
-       pe-i386.c \
-       pei-i386.c \
-       pe-mcore.c \
-       pei-mcore.c \
-       pe-ppc.c \
-       pei-ppc.c \
-       pe-sh.c \
-       pei-sh.c \
-       pe-mips.c \
-       pei-mips.c \
-       peigen.c \
-       ppcboot.c \
-       reloc16.c \
-       riscix.c \
-       sparclinux.c \
-       sparclynx.c \
-       sparcnetbsd.c \
-       sunos.c \
-       vaxnetbsd.c \
-       versados.c \
-       vms.c \
-       vms-gsd.c \
-       vms-hdr.c \
-       vms-misc.c \
-       vms-tir.c \
-       xcofflink.c
+BFD32_BACKENDS =       aout-adobe.lo   aout-arm.lo     aout-cris.lo    aout-ns32k.lo   aout-sparcle.lo         aout-tic30.lo   aout0.lo        aout32.lo       armnetbsd.lo    bout.lo         cf-i386lynx.lo  cf-m68klynx.lo  cf-sparclynx.lo         coff-a29k.lo    coff-apollo.lo  coff-arm.lo     coff-aux.lo     coff-h8300.lo   coff-h8500.lo   coff-i386.lo    coff-go32.lo    coff-i860.lo    coff-i960.lo    coff-m68k.lo    coff-m88k.lo    coff-mips.lo    coff-pmac.lo    coff-rs6000.lo  coff-sh.lo      coff-sparc.lo   coff-stgo32.lo  coff-svm68k.lo  coff-tic30.lo   coff-tic54x.lo  coff-tic80.lo   coff-u68k.lo    coff-we32k.lo   coff-w65.lo     coff-z8k.lo     cofflink.lo     dwarf1.lo       ecoff.lo        ecofflink.lo    efi-app-ia32.lo         elf.lo  elf32-arc.lo    elfarm-oabi.lo  elfarm-nabi.lo  elf32-avr.lo    elf32-cris.lo   elf32-d10v.lo   elf32-d30v.lo   elf32-fr30.lo   elf32-gen.lo    elf32-hppa.lo   elf32-i370.lo   elf32-i386.lo   elf32-i860.lo   elf32-i960.lo   elf32-ia64.lo   elf32-m32r.lo   elf32-m68hc11.lo        elf32-m68hc12.lo        elf32-m68k.lo   elf32-m88k.lo   elf-m10200.lo   elf-m10300.lo   elf32-mcore.lo  elf32-mips.lo   elf32-pj.lo     elf32-ppc.lo    elf32-sh.lo     elf32-sh-lin.lo         elf32-sparc.lo  elf32-v850.lo   elf32.lo        elflink.lo      epoc-pe-arm.lo  epoc-pei-arm.lo         hp300bsd.lo     hp300hpux.lo    som.lo  i386aout.lo     i386bsd.lo      i386dynix.lo    i386freebsd.lo  i386linux.lo    i386lynx.lo     i386msdos.lo    i386netbsd.lo   i386mach3.lo    i386os9k.lo     ieee.lo         m68k4knetbsd.lo         m68klinux.lo    m68klynx.lo     m68knetbsd.lo   m88kmach3.lo    mipsbsd.lo      newsos3.lo      nlm.lo  nlm32-i386.lo   nlm32-sparc.lo  nlm32-ppc.lo    nlm32.lo        ns32knetbsd.lo  oasys.lo        pc532-mach.lo   pe-arm.lo       pei-arm.lo      pe-i386.lo      pei-i386.lo     pe-mcore.lo     pei-mcore.lo    pe-ppc.lo       pei-ppc.lo      pe-sh.lo        pei-sh.lo       pe-mips.lo      pei-mips.lo     peigen.lo       ppcboot.lo      reloc16.lo      riscix.lo       sparclinux.lo   sparclynx.lo    sparcnetbsd.lo  sunos.lo        vaxnetbsd.lo    versados.lo     vms.lo  vms-gsd.lo      vms-hdr.lo      vms-misc.lo     vms-tir.lo      xcofflink.lo
+
+
+BFD32_BACKENDS_CFILES =        aout-adobe.c    aout-arm.c      aout-cris.c     aout-ns32k.c    aout-sparcle.c  aout-tic30.c    aout0.c         aout32.c        armnetbsd.c     bout.c  cf-i386lynx.c   cf-m68klynx.c   cf-sparclynx.c  coff-a29k.c     coff-apollo.c   coff-arm.c      coff-aux.c      coff-h8300.c    coff-h8500.c    coff-i386.c     coff-i860.c     coff-go32.c     coff-i960.c     coff-m68k.c     coff-m88k.c     coff-mips.c     coff-pmac.c     coff-rs6000.c   coff-sh.c       coff-sparc.c    coff-stgo32.c   coff-svm68k.c   coff-tic30.c    coff-tic54x.c   coff-tic80.c    coff-u68k.c     coff-we32k.c    coff-w65.c      coff-z8k.c      cofflink.c      dwarf1.c        ecoff.c         ecofflink.c     efi-app-ia32.c  elf.c   elf32-arc.c     elfarm-oabi.c   elfarm-nabi.c   elf32-avr.c     elf32-cris.c    elf32-d10v.c    elf32-d30v.c    elf32-fr30.c    elf32-gen.c     elf32-hppa.c    elf32-i370.c    elf32-i386.c    elf32-i860.c    elf32-i960.c    elf32-m32r.c    elf32-m68k.c    elf32-m68hc11.c         elf32-m68hc12.c         elf32-m88k.c    elf-m10200.c    elf-m10300.c    elf32-mcore.c   elf32-mips.c    elf32-pj.c      elf32-ppc.c     elf32-sh.c      elf32-sh-lin.c  elf32-sparc.c   elf32-v850.c    elf32.c         elflink.c       epoc-pe-arm.c   epoc-pei-arm.c  hp300bsd.c      hp300hpux.c     som.c   i386aout.c      i386bsd.c       i386dynix.c     i386freebsd.c   i386linux.c     i386lynx.c      i386msdos.c     i386netbsd.c    i386mach3.c     i386os9k.c      ieee.c  m68k4knetbsd.c  m68klinux.c     m68klynx.c      m68knetbsd.c    m88kmach3.c     mipsbsd.c       newsos3.c       nlm.c   nlm32-i386.c    nlm32-sparc.c   nlm32-ppc.c     nlm32.c         ns32knetbsd.c   oasys.c         pc532-mach.c    pe-arm.c        pei-arm.c       pe-i386.c       pei-i386.c      pe-mcore.c      pei-mcore.c     pe-ppc.c        pei-ppc.c       pe-sh.c         pei-sh.c        pe-mips.c       pei-mips.c      peigen.c        ppcboot.c       reloc16.c       riscix.c        sparclinux.c    sparclynx.c     sparcnetbsd.c   sunos.c         vaxnetbsd.c     versados.c      vms.c   vms-gsd.c       vms-hdr.c       vms-misc.c      vms-tir.c       xcofflink.c
 
 
 # The .o files needed by all of the 64 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all
 # and --enable-64-bit-bfd.
-BFD64_BACKENDS = \
-       aout64.lo \
-       coff-alpha.lo \
-       coff64-rs6000.lo \
-       demo64.lo \
-       efi-app-ia64.lo \
-       elf64-x86-64.lo \
-       elf64-alpha.lo \
-       elf64-hppa.lo \
-       elf64-ia64.lo \
-       elf64-gen.lo \
-       elf64-mips.lo \
-       elf64-sparc.lo \
-       elf64.lo \
-       nlm32-alpha.lo \
-       nlm64.lo
-
-
-BFD64_BACKENDS_CFILES = \
-       aout64.c \
-       coff-alpha.c \
-       coff64-rs6000.c \
-       demo64.c \
-       efi-app-ia64.c \
-       elf64-x86-64.c \
-       elf64-alpha.c \
-       elf64-hppa.c \
-       elf64-ia64.c \
-       elf64-gen.c \
-       elf64-mips.c \
-       elf64-sparc.c \
-       elf64.c \
-       nlm32-alpha.c \
-       nlm64.c
-
-
-OPTIONAL_BACKENDS = \
-       aix386-core.lo \
-       hpux-core.lo \
-       irix-core.lo \
-       lynx-core.lo \
-       osf-core.lo \
-       sco5-core.lo \
-       trad-core.lo \
-       cisco-core.lo
-
-
-OPTIONAL_BACKENDS_CFILES = \
-       aix386-core.c \
-       hpux-core.c \
-       irix-core.c \
-       lynx-core.c \
-       osf-core.c \
-       sco5-core.c \
-       trad-core.c \
-       cisco-core.c
+BFD64_BACKENDS =       aout64.lo       coff-alpha.lo   coff64-rs6000.lo        demo64.lo       efi-app-ia64.lo         elf64-x86-64.lo         elf64-alpha.lo  elf64-hppa.lo   elf64-ia64.lo   elf64-gen.lo    elf64-mips.lo   elf64-sparc.lo  elf64.lo        nlm32-alpha.lo  nlm64.lo
+
+
+BFD64_BACKENDS_CFILES =        aout64.c        coff-alpha.c    coff64-rs6000.c         demo64.c        efi-app-ia64.c  elf64-x86-64.c  elf64-alpha.c   elf64-hppa.c    elf64-ia64.c    elf64-gen.c     elf64-mips.c    elf64-sparc.c   elf64.c         nlm32-alpha.c   nlm64.c
+
+
+OPTIONAL_BACKENDS =    aix386-core.lo  hpux-core.lo    irix-core.lo    lynx-core.lo    osf-core.lo     sco5-core.lo    trad-core.lo    cisco-core.lo
+
+
+OPTIONAL_BACKENDS_CFILES =     aix386-core.c   hpux-core.c     irix-core.c     lynx-core.c     osf-core.c      sco5-core.c     trad-core.c     cisco-core.c
 
 
 # These are defined by configure.in:
@@ -598,26 +191,13 @@ TDEFAULTS = @tdefaults@
 INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
 
 # C source files that correspond to .o's.
-CFILES = \
-       $(BFD_LIBS_CFILES) \
-       $(ALL_MACHINES_CFILES) \
-       $(BFD32_BACKENDS_CFILES) \
-       $(BFD64_BACKENDS_CFILES) \
-       $(OPTIONAL_BACKENDS_CFILES)
+CFILES =       $(BFD_LIBS_CFILES)      $(ALL_MACHINES_CFILES)  $(BFD32_BACKENDS_CFILES)        $(BFD64_BACKENDS_CFILES)        $(OPTIONAL_BACKENDS_CFILES)
 
 
-SOURCE_HFILES = \
-       aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
-       elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h \
-       elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \
-       libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
-       libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \
-       nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h xcoff-target.h
+SOURCE_HFILES =        aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h        elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h      elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h    libaout.h libbfd.h libcoff.h libecoff.h libhppa.h       libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h    nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h xcoff-target.h
 
 
-HFILES = \
-       elf32-target.h elf64-target.h targmatch.h \
-       $(SOURCE_HFILES)
+HFILES =       elf32-target.h elf64-target.h targmatch.h       $(SOURCE_HFILES)
 
 
 POTFILES = $(CFILES) $(SOURCE_HFILES)
@@ -644,18 +224,15 @@ libbfd_a_SOURCES =
 BFD_H_DEPS = $(INCDIR)/ansidecl.h
 LOCAL_H_DEPS = libbfd.h sysdep.h config.h
 
-BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-       reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c
+BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c   reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c
 
 LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
 LIBCOFF_H_FILES = libcoff-in.h coffcode.h
 
-MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
-       targmatch.h
+MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles   targmatch.h
 
 
-CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
-       stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
+CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib    stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
@@ -688,7 +265,7 @@ configure.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES)
 OBJECTS = $(libbfd_a_OBJECTS) $(libbfd_la_OBJECTS)
@@ -949,7 +526,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -1140,10 +717,10 @@ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
 # Install BFD include file, and others that it needs.
 install-data-local: $(BFD_H)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(includedir)
-       $(INSTALL_DATA) $(BFD_H) $(includedir)/bfd.h
-       $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
-       $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
+       $(mkinstalldirs) $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(includedir)/bfd.h
+       $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(DESTDIR)$(includedir)/ansidecl.h
+       $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(DESTDIR)$(includedir)/bfdlink.h
 
 # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
 DEP: dep.sed $(CFILES) $(HFILES) bfd.h