X-Git-Url: https://repo.jachan.dev/binutils.git/blobdiff_plain/4447efa217407344b433f0e056047e4782aede3f..c768aaa7c34f137ae65f544590ed6e6062db8593:/binutils/Makefile.in

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 97665a63df..297044a95b 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for GNU binary-file utilities
-# Copyright (C) 1989-1992 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 
 # This file is part of GNU binutils.
 
@@ -44,9 +44,11 @@ docdir = $(datadir)/doc
 
 SHELL = /bin/sh
 
-INSTALL = install -c
+INSTALL = `cd $(srcdir)/..;pwd`/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
+INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
+INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
 
 AR = ar
 AR_FLAGS = qv
@@ -56,6 +58,7 @@ TEXI2DVI = texi2dvi
 RANLIB = ranlib
 BISONFLAGS = -d
 TEXI2ROFF=texi2roff
+MAKEOVERRIDES=
 
 NM_FOR_TARGET = nm
 NM = $(NM_FOR_TARGET)
@@ -67,16 +70,16 @@ LEX_OPTIONS = -I -Cem
 LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi`
 
 # Distribution version
-VERSION=2.2
+VERSION=cygnus-2.3.1
 # Distribution name
 DIST_NAME=binutils-${VERSION}
 
 version=`./../gcc/gcc -dumpversion`
 
 # Where to find texinfo.tex to format docn with TeX
-TEXIDIR = $(srcdir)/../texinfo/fsf
+TEXIDIR = $(srcdir)/../texinfo
 
-MANPAGES= ar nm objdump ranlib size strip
+MANPAGES= ar nm objdump ranlib size strings strip c++filt objcopy nlmconv
 
 #CC=gcc -Wall
 # these two are almost the same program
@@ -87,6 +90,8 @@ RANLIB_PROG=ranlib
 OBJCOPY_PROG=objcopy
 STRIP_PROG=strip
 
+STRINGS_PROG=strings
+
 # These should all be the same program too.
 SIZE_PROG=size
 NM_PROG=nm
@@ -95,22 +100,25 @@ OBJDUMP_PROG=objdump
 # This is the demangler, as a standalone program.
 DEMANGLER_PROG=c++filt
 
-PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG)
+NLMCONV_PROG=nlmconv
+
+PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(BUILD_NLMCONV)
 STAGESTUFF = $(PROGS) *.o
 # Files that can be generated, but should be in the distribution.
-DISTSTUFF=arparse.c arlex.c
+DISTSTUFF=arparse.c arlex.c nlmheader.c info
 
 BASEDIR = $(srcdir)/..
-LIBDIR  = ./../bfd
-OPCODEDIR = ./../opcodes
+BFDDIR = $(BASEDIR)/bfd
+INCDIR	= $(BASEDIR)/include
+INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR)
 
 #### host and target dependant Makefile fragments come in here.
 ###
 
-INCLUDES = -I. -I$(srcdir) -I$(BASEDIR)/include -I$(BASEDIR)/bfd
+ALL_CFLAGS = $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CFLAGS)
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $<
+	$(CC) -c $(ALL_CFLAGS) $<
 
 #
 ## Random definitions
@@ -124,21 +132,21 @@ INCLUDES = -I. -I$(srcdir) -I$(BASEDIR)/include -I$(BASEDIR)/bfd
 # fail unnecessarily.  I've also seen some Unix malloc's fail, even when
 # there is enough memory.  So use the new GNU malloc.
 # MALLOC = gmalloc.o
+# Use this if the system malloc is good enough.
+MALLOC =
 
 # Use the GNU getopt unless you have problems with it.
 # The IRIS version could probably benefit from being assembled with
 # libmalloc rather than the ordinary malloc.
-LIBIBERTY_SRC_DIR = $(srcdir)/../libiberty
-LIBIBERTY_BIN_DIR = ./../libiberty
-LIBIBERTY = $(LIBIBERTY_BIN_DIR)/libiberty.a
+LIBIBERTY = ../libiberty/libiberty.a
 
 # Code shared by all the binutils.
 BULIBS = bucomm.o version.o filemode.o
 
-ADDL_LIBS = $(MALLOC) $(BULIBS) $(BFD) $(LIBIBERTY)
+ADDL_LIBS = $(MALLOC) $(BULIBS) $(BFD) $(LIBIBERTY) 
 
-BFD = $(LIBDIR)/libbfd.a
-OPCODES = $(OPCODEDIR)/libopcodes.a
+BFD = ../bfd/libbfd.a
+OPCODES = ../opcodes/libopcodes.a
 
 RUNTEST = runtest
 RUNTESTFLAGS = 
@@ -152,6 +160,7 @@ FLAGS_TO_PASS = \
 	NM=`if [ -f $$rootme/$(NM_PROG) ] ; then echo $$rootme/$(NM_PROG) ; else echo $(NM_PROG); fi` \
 	AR=`if [ -f $$rootme/$(AR_PROG) ] ; then echo $$rootme/$(AR_PROG) ; else echo $(AR_PROG); fi` \
 	OBJDUMP=`if [ -f $$rootme/$(OBJDUMP_PROG) ] ; then echo $$rootme/$(OBJDUMP_PROG) ; else echo $(OBJDUMP_PROG); fi` \
+	STRINGS=`if [ -f $$rootme/$(STRINGS_PROG) ] ; then echo $$rootme/$(STRINGS_PROG) ; else echo $(STRINGS_PROG); fi` \
 	STRIP=`if [ -f $$rootme/$(STRIP_PROG) ] ; then echo $$rootme/$(STRIP_PROG) ; else echo $(STRIP_PROG); fi` \
 	RANLIB=`if [ -f $$rootme/$(RANLIB_PROG) ] ; then echo $$rootme/$(RANLIB_PROG) ; else echo $(RANLIB_PROG); fi` \
 	DEMANGLE=`if [ -f $$rootme/$(DEMANGLER_PROG) ] ; then echo $$rootme/$(DEMANGLER_PROG) ; else echo $(DEMANGLER_PROG); fi`"
@@ -162,10 +171,10 @@ FLAGS_TO_PASS = \
 all: $(ADDL_LIBS) $(PROGS)
 
 testsuite:
-	if [ -d testsuite ]; then \
-			(rootme=`pwd`/ ; export rootme ; \
-			 rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-			 cd testsuite; $(MAKE) FLAGS_TO_PASS=$(FLAGS_TO_PASS)); \
+	if [ -f testsuite/Makefile.in ]; then \
+		(rootme=`pwd`/ ; export rootme ; \
+		 rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
+		 cd testsuite; $(MAKE) FLAGS_TO_PASS=$(FLAGS_TO_PASS)); \
 	else true ; fi
 
 check: force
@@ -180,56 +189,67 @@ info: binutils.info
 
 dvi: binutils.dvi
 
-#$(BFD):$(LIBDIR)/../common/*.c
-#	(cd $(LIBDIR); make)
-
 $(SIZE_PROG): $(ADDL_LIBS) size.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(SIZE_PROG) size.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(SIZE_PROG) size.o $(ADDL_LIBS) $(EXTRALIBS)
 
 $(OBJCOPY_PROG): $(ADDL_LIBS) objcopy.o not-strip.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(OBJCOPY_PROG) objcopy.o not-strip.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OBJCOPY_PROG) objcopy.o not-strip.o $(ADDL_LIBS) $(EXTRALIBS)
+
+$(STRINGS_PROG): $(ADDL_LIBS) strings.o $(BFD)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(STRINGS_PROG) strings.o $(ADDL_LIBS) $(EXTRALIBS)
 
 $(STRIP_PROG): $(ADDL_LIBS) objcopy.o is-strip.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(STRIP_PROG) objcopy.o is-strip.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(STRIP_PROG) objcopy.o is-strip.o $(ADDL_LIBS) $(EXTRALIBS)
+
+$(NM_PROG): $(ADDL_LIBS) nm.o demangle.o $(BFD)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(NM_PROG) nm.o demangle.o $(ADDL_LIBS) $(EXTRALIBS)
 
-$(NM_PROG): $(ADDL_LIBS) nm.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(NM_PROG) nm.o $(ADDL_LIBS) $(LOADLIBES)
+$(OBJDUMP_PROG): $(ADDL_LIBS) objdump.o $(BFD) $(OPCODES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OBJDUMP_PROG) objdump.o $(OPCODES) $(ADDL_LIBS) $(EXTRALIBS)
 
-$(OBJDUMP_PROG): $(ADDL_LIBS) size.o objdump.o $(BFD) $(OPCODES)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(OBJDUMP_PROG) objdump.o $(OPCODES) $(ADDL_LIBS) $(LOADLIBES)
+objdump.o: objdump.c config.status
+	$(CC) -c $(INCLUDES) $(HDEFINES) $(TDEFINES) $(ARCHDEFS) $(CFLAGS) $(srcdir)/objdump.c
 
 underscore.c:
 	echo "int xxy_us_dummy;" >dummy.c
 	$(CC) -c dummy.c
+	rm -f underscore.c
 	echo '/*WARNING: This file is automatically generated!*/' >underscore.c
-	if [ "`$(NM) dummy.o | grep _xxy_us_dummy`" != "" ]; then \
+	if [ "`$(NM) dummy.o | grep _xxy_us_dummy ; true`" != "" ]; then \
 	  echo "int prepends_underscore = 1;" >>underscore.c; \
 	else \
 	  echo "int prepends_underscore = 0;" >>underscore.c; \
 	fi
 	-rm -f dummy.c dummy.o
 
-cplus-dem.o: $(LIBIBERTY_SRC_DIR)/cplus-dem.c
-	$(CC) -c -DMAIN $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(LIBIBERTY_SRC_DIR)/cplus-dem.c
+version.o: version.c
+	$(CC) $(INCLUDES) $(HDEFINES) $(TDEFINES) -DVERSION='"$(VERSION)"' $(CFLAGS) -c $(srcdir)/version.c
 
-$(DEMANGLER_PROG): cplus-dem.o $(LIBIBERTY) underscore.o
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(DEMANGLER_PROG) cplus-dem.o $(LIBIBERTY) $(LOADLIBES) underscore.o
+demangle.o: $(BASEDIR)/libiberty/cplus-dem.c
+	$(CC) -c $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CFLAGS) $(BASEDIR)/libiberty/cplus-dem.c
+	mv cplus-dem.o demangle.o
 
-arparse.c:arparse.y
+# For parallel compiling, depend on demangle.o so that one gets done first.
+cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h demangle.o
+	$(CC) -c -DMAIN $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CFLAGS) $(BASEDIR)/libiberty/cplus-dem.c
+
+$(DEMANGLER_PROG): cplus-dem.o $(LIBIBERTY) underscore.o version.o
+	$(CC) $(CFLAGS) $(LDFLAGS)  -o $(DEMANGLER_PROG) cplus-dem.o $(LIBIBERTY) $(EXTRALIBS) underscore.o version.o
+
+arparse.h arparse.c: arparse.y
 	$(BISON) $(BISONFLAGS)  $(srcdir)/arparse.y
 	-mv y.tab.c arparse.c
 	-mv y.tab.h arparse.h
 
-
 arlex.c: arlex.l
 	$(LEX) $(LEX_OPTIONS) $(srcdir)/arlex.l
 	mv lex.yy.c arlex.c
 
 $(AR_PROG): $(ADDL_LIBS) ar.o arparse.o arlex.o not-ranlib.o $(BFD) arsup.o
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(AR_PROG) ar.o arparse.o arlex.o arsup.o not-ranlib.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(AR_PROG) ar.o arparse.o arlex.o arsup.o not-ranlib.o $(ADDL_LIBS) $(EXTRALIBS)
 
 $(RANLIB_PROG): $(ADDL_LIBS) ar.o is-ranlib.o arparse.o arlex.o arsup.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(RANLIB_PROG) ar.o arparse.o arlex.o arsup.o is-ranlib.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(RANLIB_PROG) ar.o arparse.o arlex.o arsup.o is-ranlib.o $(ADDL_LIBS) $(EXTRALIBS)
 
 # This rule creates a single binary that switches between ar and ranlib
 # by looking at argv[0].  Use this kludge to save some disk space.
@@ -239,17 +259,77 @@ $(RANLIB_PROG): $(ADDL_LIBS) ar.o is-ranlib.o arparse.o arlex.o arsup.o $(BFD)
 # Alternatively, you can install ranlib.sh as ranlib.
 
 ar_with_ranlib: $(ADDL_LIBS) ar.o maybe-ranlib.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(AR_PROG) ar.o maybe-ranlib.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(AR_PROG) ar.o maybe-ranlib.o $(ADDL_LIBS) $(EXTRALIBS)
 	-rm -f $(RANLIB_PROG)
 	-ln $(AR_PROG) $(RANLIB_PROG)
 
 # objcopy and strip in one binary that uses argv[0] to decide its action.
 
 objcopy_with_strip: $(ADDL_LIBS) objcopy.o maybe-strip.o $(BFD)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $(OBJCOPY_PROG) objcopy.o maybe-strip.o $(ADDL_LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OBJCOPY_PROG) objcopy.o maybe-strip.o $(ADDL_LIBS) $(EXTRALIBS)
 	-rm -f $(STRIP_PROG)
 	-ln $(OBJCOPY_PROG) $(STRIP_PROG)
 
+nlmheader.c: nlmheader.y
+	$(BISON) $(srcdir)/nlmheader.y
+	rm -f nlmheader.c
+	-mv y.tab.c nlmheader.c
+
+nlmconv.o: nlmconv.c
+	ldname=`t='$(program_transform_name)'; echo ld | sed -e "" $$t`; \
+	$(CC) -c -DLD_NAME="\"$${ldname}\"" $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CFLAGS) $(srcdir)/nlmconv.c
+
+$(NLMCONV_PROG): nlmconv.o nlmheader.o $(ADDL_LIBS) $(BFD)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ nlmconv.o nlmheader.o $(ADDL_LIBS) $(EXTRALIBS)
+
+# This list of dependencies was generated by doing a make with gcc -MM
+# saving the output in a file and removing the gcc commands
+# changing "../../devo/binutils/../bfd" to "$(BFDDIR)"
+# removing "../../devo/binutils/"
+# changing "../include" to "$(INCDIR)"
+
+bucomm.o: bucomm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h bucomm.h
+filemode.o: filemode.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h 
+size.o: size.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/getopt.h 
+objdump.o: objdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/getopt.h \
+  $(INCDIR)/dis-asm.h $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/elf/internal.h $(INCDIR)/aout/stab.def 
+nm.o: nm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h bucomm.h $(INCDIR)/getopt.h \
+  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h
+ar.o: ar.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h bucomm.h $(INCDIR)/aout/ar.h \
+  $(BFDDIR)/libbfd.h arsup.h 
+arparse.o: arparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h arsup.h 
+arlex.o: arlex.c ./arparse.h 
+not-ranlib.o: not-ranlib.c 
+arsup.o: arsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h arsup.h bucomm.h 
+strings.o: strings.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h bucomm.h 
+objcopy.o: objcopy.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h bucomm.h 
+is-strip.o: is-strip.c 
+is-ranlib.o: is-ranlib.c 
+not-strip.o: not-strip.c 
+nlmheader.o: nlmheader.c nlmconv.h $(INCDIR)/nlm/common.h \
+  $(INCDIR)/nlm/internal.h
+nlmconv.o: $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
+  $(BFDDIR)/libnlm.h bucomm.h
+
 stage1: force
 	- mkdir stage1
 	- mv -f $(STAGESTUFF) stage1
@@ -283,7 +363,7 @@ de-stage3: force
 # DOCUMENTATION TARGETS
 # TeX output
 binutils.dvi: $(srcdir)/binutils.texi
-	$(TEXI2DVI) $(srcdir)/binutils.texi
+	TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/binutils.texi
 
 # info file for online browsing
 binutils.info: $(srcdir)/binutils.texi
@@ -294,7 +374,7 @@ binutils.info: $(srcdir)/binutils.texi
 # If you want an index, see texi2roff doc for postprocessing 
 # and add -i to texi2roff invocations below.
 # Workarounds for texi2roff-2 (probably fixed in later texi2roff's, delete
-#    correspondint -e lines when later texi2roff's are current)
+#    corresponding -e lines when later texi2roff's are current)
 # + @ifinfo's deleted explicitly due to texi2roff-2 bug w nested constructs.
 # + @c's deleted explicitly because texi2roff sees texinfo commands in them
 # + @   (that's at-BLANK) not recognized by texi2roff, turned into blank
@@ -354,44 +434,44 @@ binutils.me: $(srcdir)/binutils.texi
 mostlyclean:
 	-rm -f *.o *~ \#* core binutils.?? binutils.???
 clean: mostlyclean
+	@if [ -d testsuite ] ; then \
+	  cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) clean ; \
+	else true; fi
 	-rm -f $(PROGS) underscore.c
-distclean: clean
-	-rm -f Makefile config.status sysdep.h
-realclean: distclean
+distclean:
+	@if [ -d testsuite ] ; then \
+	  cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) distclean ; \
+	else true; fi
+	-rm -f Makefile config.status sysdep.h *.o *~ \#* core \
+		binutils.?? binutils.??s binutils.aux binutils.log binutils.toc
+realclean: clean distclean
 	-rm -f $(DISTSTUFF) TAGS
 
 etags tags: TAGS
 
 TAGS: force
-	etags $(INCDIR)/*.h $(BFDSRC)/*.[hc] *.[hc]
+	etags $(INCDIR)/*.h $(srcdir)/*.[hc] 
 
 install: all
-	-parent=`echo $(bindir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; fi
-	-for i in $(PROGS) ; do \
-		$(INSTALL_PROGRAM) $$i $(bindir)/`t='$(program_transform_name)'; echo $$i | sed -e "" $$t` ; \
+	for i in $(PROGS) ; do \
+	  $(INSTALL_XFORM) $$i $(bindir)/$$i ; \
 	done
-	-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi
-	-for i in $(MANPAGES) ; do \
-		$(INSTALL_DATA) $(srcdir)/$$i.1 $(man1dir)/`t='$(program_transform_name)'; echo $$i | sed -e "" $$t`.1 ; \
+	for i in $(MANPAGES) ; do \
+	  $(INSTALL_XFORM1) $(srcdir)/$$i.1 $(man1dir)/$$i.1 ; \
 	done
 	-if [ -d $(tooldir) ]; then \
 	   if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
-	   for i in nm strip ; do \
+	   for i in nm strip ar ranlib; do \
 	     rm -f $(tooldir)/bin/$$i; \
 	     ln $(bindir)/`t='$(program_transform_name)'; echo $$i | sed -e "" $$t` $(tooldir)/bin/$$i \
 	      || $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$i; \
 	   done; \
 	 else true; fi		
 
-install-info: info
-	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
-	for i in *.info* ; do \
+# Use binutils.info as the target so that VPATH will DTRT.
+# (Use "$<*" in case the output is multiple files, though.)
+install-info: binutils.info
+	for i in $<* ; do \
 		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
 	done
 
@@ -421,29 +501,6 @@ $(DIST_NAME).tar.z:
 	cd ../..; tar chf - $(DIST_NAME) | gzip >$(DIST_NAME).tar.z
 	rm -rf ../../$(DIST_NAME)
 
-# These get around a bug in Sun Make in SunOS 4.1.1
-alloca.o:alloca.c
-ar.o: ar.c
-arsup.o: arsup.c
-bucomm.o: bucomm.c
-objcopy.o: objcopy.c
-filemode.o:filemode.c
-getopt.o:getopt.c
-getopt1.o:getopt1.c
-gmalloc.o:gmalloc.c
-is-ranlib.o:is-ranlib.c
-is-strip.o:is-strip.c
-maybe-ranlib.o:maybe-ranlib.c
-maybe-strip.o:maybe-strip.c
-nm.o: nm.c
-not-ranlib.o:not-ranlib.c
-not-strip.o:not-strip.c
-objdump.o: objdump.c
-size.o: size.c
-strip.o:strip.c
-version.o: $(srcdir)/version.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) -DVERSION='"$(VERSION)"' -c $(srcdir)/version.c
-
 #-----------------------------------------------------------------------------
 #		'STANDARD' GNU/960 TARGETS BELOW THIS POINT
 #