* Makefile.in: Note dependencies on bucomm.h.

	(cplus-dem.o): Link c++filt with version.o.

	* strings.c: Include bucomm.h and add prototypes to other decls.
	Remove -h option.

	* bucomm.h: Declare xrealloc.

	* nm.c, objcopy.c, objdump.c, size.c, strings.c (main, usage): Add
	--help option.  Put "GNU" in the version message.
	(usage): Take stream and exit status as args.
	(main): Pass new args to usage.

1 files changed, 57 insertions, 54 deletions

diff --git a/binutils/objcopy.1 b/binutils/objcopy.1
index 2323e7e..b9620de 100644
--- a/binutils/objcopy.1
+++ b/binutils/objcopy.1
@@ -8,48 +8,25 @@
 ..
 
 .SH NAME
-objcopy\(em\&copies and translates object files
+objcopy\(em\&copy and translate object files
 
 .SH SYNOPSIS
 .hy 0
 .na
+.TP
 .B objcopy
-.RS
-[
-.B -F \fIformat\fB | --format=\fIformat\fB
-]
-.br
-[
-.B -I \fIformat\fB | --input-format=\fIformat\fB
-]
-.br
-[
-.B -O \fIformat\fB | --output-format=\fIformat\fB
-]
-.br
-[
-.B -S | --strip-all
-] [
-.B -g | --strip-debug
-]
-.br
-[
-.B -x | --discard-all
-] [
-.B -X | --discard-locals
-]
-.br
-[
-.B -v | --verbose
-] [
-.B -V | --version
-]
-.br
-.I infile
-[
-.I outfile
-]
-.RE
+.RB "[\|" \-F \fIformat\fB | \-\-format=\fIformat\fB "\|]" 
+.RB "[\|" \-I \fIformat\fB | \-\-input\-format=\fIformat\fB "\|]" 
+.RB "[\|" \-O \fIformat\fB | \-\-output\-format=\fIformat\fB "\|]" 
+.RB "[\|" \-S | \-\-strip\-all "\|]" 
+.RB "[\|" \-g | \-\-strip\-debug "\|]" 
+.RB "[\|" \-x | \-\-discard\-all "\|]" 
+.RB "[\|" \-X | \-\-discard\-locals "\|]" 
+.RB "[\|" \-v | \-\-verbose "\|]" 
+.RB "[\|" \-V | \-\-version "\|]" 
+.RB "[\|" \-\-help "\|]" 
+.B infile
+.RB "[\|" outfile "\|]" 
 .SH DESCRIPTION
 The GNU 
 .B objcopy
@@ -60,7 +37,7 @@ write the destination object file in a format different from that of
 the source object file.  The exact behavior of 
 .B objcopy
 is controlled by command-line options.
-
+.PP
 .B objcopy
 creates temporary files to do its translations and deletes them
 afterward.
@@ -68,51 +45,77 @@ afterward.
 uses BFD to do all its translation work; it knows about all the
 formats BFD knows about, and thus is able to recognize most formats
 without being told explicitly.
-
-.SH OPTIONS
-.TP 0.5i
-.I infile\fR,\fI outfile
-The source and output files respectively.  If you do not specify
+.PP
+.I infile
+and
+.I outfile
+are the source and output files respectively.  If you do not specify
 .IR outfile ,
 .B objcopy
 creates a temporary file and destructively renames the result with the
 name of the input file.
+
+.SH OPTIONS
 .TP
-.B -I \fIformat\fB, --input-format=\fIformat\fB
+.B \-I \fIformat
+.TP
+.B \-\-input\-format=\fIformat
 Consider the source file's object format to be 
 .IR format ,
 rather than attempting to deduce it.
 .TP
-.B -O \fIformat\fB, --output-format=\fIformat\fB
+.B \-O \fIformat
+.TP
+.B \-\-output\-format=\fIformat
 Write the output file using the object format 
 .IR format .
 .TP
-.B -F \fIformat\fB, --format=\fIformat\fB
+.B \-F \fIformat\fB
+.TP
+.B \-\-format=\fIformat
 Use 
 .I format
 as the object format for both the input and the output file; i.e.
 simply transfer data from source to destination with no translation.
 .TP
-.B -S, --strip-all
+.B \-S
+.TP
+.B \-\-strip\-all
 Do not copy relocation and symbol information from the source file.
 .TP
-.B -g, --strip-debug
+.B \-g
+.TP
+.B \-\-strip\-debug
 Do not copy debugging symbols from the source file.
 .TP
-.B -x, --discard-all
+.B \-x
+.TP
+.B \-\-discard\-all
 Do not copy non-global symbols from the source file.
 .TP
-.B -X, --discard-locals
+.B \-X
+.TP
+.B \-\-discard\-locals
 Do not copy compiler-generated local symbols. (These usually start
 with "L" or ".").
 .TP
-.B -v, --verbose
+.B \-v
+.TP
+.B \-\-verbose
 Verbose output: list all object files modified.  In the case of
-archives, "\fBobjcopy -V\fR" lists all members of the archive.
+archives, "\fBobjcopy \-V\fR" lists all members of the archive.
+.TP
+.B \-V
 .TP
-.B -V, --version
+.B \-\-version
 Show the version number of
-.BR objcopy .
+.B objcopy
+and exit.
+.TP
+.B \-\-help
+Show a summary of the options to
+.B objcopy
+and exit.
 .SH "SEE ALSO"
 .RB "`\|" binutils "\|'" 
 entry in