Index: gcc/java/ChangeLog

from  Tom Tromey  <tromey@redhat.com>

	* Make-lang.in (JAVA_MANFILES): Removed grmiregistry.1.
	(java.maintainer-clean): Likewise.
	(java.install-man): Likewise.
	(.INTERMEDIATE): Removed grmiregistry.pod.
	(grmiregistry.pod): Removed.
	* gcj.texi (Invoking gcjh): Removed.
	(Invoking gjnih): Likewise.
	(Invoking grmiregistry): Likewise.
	(direntry): Updated.
	(Top): Likewise.
	(which-gcj): Removed.

Index: libjava/classpath/ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* doc/cp-tools.texinfo (gcjh Tool): Added more text.
	(rmid Tool): Likewise.

2007-03-25  Dalibor Topic  <robilad@kaffe.org>

	* doc/cp-tools.texinfo: Fix node ordering.

2007-03-19  Matthias Klose  <doko@ubuntu.com>

	* doc/Makefile.am: Build a gcjh(1) man page.
	* doc/cp-tools.texinfo: Add documentation for gcjh.

From-SVN: r123253

4 files changed, 111 insertions, 28 deletions

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 54f71df..2ff19be 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,17 @@
+2007-03-26  Tom Tromey  <tromey@redhat.com>
+
+	* doc/cp-tools.texinfo (gcjh Tool): Added more text.
+	(rmid Tool): Likewise.
+
+2007-03-25  Dalibor Topic  <robilad@kaffe.org>
+
+	* doc/cp-tools.texinfo: Fix node ordering.
+
+2007-03-19  Matthias Klose  <doko@ubuntu.com>
+
+	* doc/Makefile.am: Build a gcjh(1) man page.
+	* doc/cp-tools.texinfo: Add documentation for gcjh.
+
 2007-03-26  Stepan Kasal  <skasal@redhat.com>
 
 	* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
diff --git a/libjava/classpath/doc/Makefile.am b/libjava/classpath/doc/Makefile.am
index c845195..641d8d0 100644
--- a/libjava/classpath/doc/Makefile.am
+++ b/libjava/classpath/doc/Makefile.am
@@ -23,6 +23,7 @@ TOOLS_MANFILES = \
 	gjar.1 \
 	gjarsigner.1 \
 	gjavah.1 \
+	gcjh.1 \
 	gkeytool.1 \
 	gnative2ascii.1 \
 	gorbd.1 \
@@ -55,7 +56,7 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
 
 .INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \
 	gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \
-	gserialver.pod gtnameserv.pod
+	gserialver.pod gtnameserv.pod gcjh.pod
 
 gappletviewer.pod: $(srcdir)/cp-tools.texinfo
 	-$(TEXI2POD) -D gappletviewer < $< > $@
@@ -66,6 +67,9 @@ gjarsigner.pod: $(srcdir)/cp-tools.texinfo
 gjar.pod: $(srcdir)/cp-tools.texinfo
 	-$(TEXI2POD) -D gjar < $< > $@
 
+gcjh.pod: $(srcdir)/cp-tools.texinfo
+	-$(TEXI2POD) -D gcjh < $< > $@
+
 gjavah.pod: $(srcdir)/cp-tools.texinfo
 	-$(TEXI2POD) -D gjavah < $< > $@
 
diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in
index 487924b..ad1b552 100644
--- a/libjava/classpath/doc/Makefile.in
+++ b/libjava/classpath/doc/Makefile.in
@@ -58,7 +58,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-INFO_DEPS = $(srcdir)/tools.info
+INFO_DEPS = cp-tools.info
 am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include
 DVIS = cp-tools.dvi
 PDFS = cp-tools.pdf
@@ -326,6 +326,7 @@ TOOLS_MANFILES = \
 	gjar.1 \
 	gjarsigner.1 \
 	gjavah.1 \
+	gcjh.1 \
 	gkeytool.1 \
 	gnative2ascii.1 \
 	gorbd.1 \
@@ -364,7 +365,7 @@ MAINTAINERCLEANFILES = \
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .dvi .html .info .pdf .ps .texinfo
+.SUFFIXES: .dvi .ps
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -404,42 +405,38 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 
-.texinfo.info:
+cp-tools.info: cp-tools.texinfo $(cp_tools_TEXINFOS)
 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-	am__cwd=`pwd` && cd $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
 	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
 	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
 	  done; \
 	else :; fi && \
-	cd "$$am__cwd"; \
 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $@ $<; \
+	 -o $@ `test -f 'cp-tools.texinfo' || echo '$(srcdir)/'`cp-tools.texinfo; \
 	then \
 	  rc=0; \
-	  cd $(srcdir); \
 	else \
 	  rc=$$?; \
-	  cd $(srcdir) && \
 	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
 	fi; \
 	rm -rf $$backupdir; exit $$rc
 
-.texinfo.dvi:
+cp-tools.dvi: cp-tools.texinfo $(cp_tools_TEXINFOS) 
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $<
+	$(TEXI2DVI) -o $@ `test -f 'cp-tools.texinfo' || echo '$(srcdir)/'`cp-tools.texinfo
 
-.texinfo.pdf:
+cp-tools.pdf: cp-tools.texinfo $(cp_tools_TEXINFOS) 
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $<
+	$(TEXI2PDF) -o $@ `test -f 'cp-tools.texinfo' || echo '$(srcdir)/'`cp-tools.texinfo
 
-.texinfo.html:
+cp-tools.html: cp-tools.texinfo $(cp_tools_TEXINFOS) 
 	rm -rf $(@:.html=.htp)
 	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $(@:.html=.htp) $<; \
+	 -o $(@:.html=.htp) `test -f 'cp-tools.texinfo' || echo '$(srcdir)/'`cp-tools.texinfo; \
 	then \
 	  rm -rf $@; \
 	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
@@ -449,10 +446,6 @@ distclean-libtool:
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
-$(srcdir)/tools.info: cp-tools.texinfo $(cp_tools_TEXINFOS)
-tools.dvi: cp-tools.texinfo $(cp_tools_TEXINFOS)
-tools.pdf: cp-tools.texinfo $(cp_tools_TEXINFOS)
-tools.html: cp-tools.texinfo $(cp_tools_TEXINFOS)
 .dvi.ps:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) -o $@ $<
@@ -498,8 +491,8 @@ mostlyclean-aminfo:
 	-rm -rf cp-tools.aux cp-tools.cp cp-tools.cps cp-tools.fn cp-tools.fns \
 	  cp-tools.ky cp-tools.kys cp-tools.log cp-tools.pg \
 	  cp-tools.pgs cp-tools.tmp cp-tools.toc cp-tools.tp \
-	  cp-tools.tps cp-tools.vr cp-tools.vrs tools.dvi tools.pdf \
-	  tools.ps tools.html
+	  cp-tools.tps cp-tools.vr cp-tools.vrs cp-tools.dvi \
+	  cp-tools.pdf cp-tools.ps cp-tools.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -891,7 +884,7 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
 
 .INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \
 	gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \
-	gserialver.pod gtnameserv.pod
+	gserialver.pod gtnameserv.pod gcjh.pod
 
 gappletviewer.pod: $(srcdir)/cp-tools.texinfo
 	-$(TEXI2POD) -D gappletviewer < $< > $@
@@ -902,6 +895,9 @@ gjarsigner.pod: $(srcdir)/cp-tools.texinfo
 gjar.pod: $(srcdir)/cp-tools.texinfo
 	-$(TEXI2POD) -D gjar < $< > $@
 
+gcjh.pod: $(srcdir)/cp-tools.texinfo
+	-$(TEXI2POD) -D gcjh < $< > $@
+
 gjavah.pod: $(srcdir)/cp-tools.texinfo
 	-$(TEXI2POD) -D gjavah < $< > $@
 
diff --git a/libjava/classpath/doc/cp-tools.texinfo b/libjava/classpath/doc/cp-tools.texinfo
index c6c887e..64a9b67 100644
--- a/libjava/classpath/doc/cp-tools.texinfo
+++ b/libjava/classpath/doc/cp-tools.texinfo
@@ -1,7 +1,7 @@
 \input texinfo @c -*-texinfo-*-
 
 @c %**start of header
-@setfilename tools.info
+@setfilename cp-tools.info
 @settitle GNU Classpath Tools Guide
 @c %**end of header
 
@@ -22,7 +22,7 @@
 This file documents the Tools included in a standard distribution of the GNU
 Classpath project deliverables.
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 @ifnotplaintext
 @dircategory GNU Libraries
@@ -127,6 +127,7 @@ Other Tools
 
 * jar Tool::                   Archive tool for Java archives
 * javah Tool::                 A java header compiler
+* gcjh Tool::                  A java header compiler (old version)
 * native2ascii Tool::          An encoding converter
 * orbd Tool::                  An object request broker daemon
 * serialver Tool::             A serial version command
@@ -1215,12 +1216,13 @@ For more details @pxref{verbose}.
 @chapter Other Tools
 
 This is a list of currently undocumented classpath tools: @b{jar},
-@b{javah}, @b{native2ascii}, @b{orbd}, @b{serialver}, @b{rmid}, @b{rmiregistry}
+@b{javah}, @b{gcjh}, @b{native2ascii}, @b{orbd}, @b{serialver}, @b{rmid}, @b{rmiregistry}
 and @b{tnameserv}.
 
 @menu
 * jar Tool::                   Archive tool for Java archives
 * javah Tool::                 A java header compiler
+* gcjh Tool::                  A java header compiler (old version)
 * native2ascii Tool::          An encoding converter
 * orbd Tool::                  An object request broker daemon
 * serialver Tool::             A serial version command
@@ -1324,7 +1326,7 @@ java(1), @dots{}
 
 @comment ----------------------------------------------------------------------
 
-@node javah Tool, native2ascii Tool, jar Tool, Other Tools
+@node javah Tool, gcjh Tool, jar Tool, Other Tools
 @comment node-name, next, previous, up
 @section The @command{javah} Tool
 @c man title gjavah - generate header files from Java class files
@@ -1407,7 +1409,73 @@ javac(1), @dots{}
 
 @comment ----------------------------------------------------------------------
 
-@node native2ascii Tool, orbd Tool, javah Tool, Other Tools
+@node gcjh Tool, native2ascii Tool, javah Tool, Other Tools
+@comment node-name, next, previous, up
+@section The @command{gcjh} Tool
+@c man title gcjh - generate header files from Java class files
+
+@c man begin DESCRIPTION gcjh
+
+The @code{gcjh} program is used to generate header files from class
+files.  It can generate both CNI and JNI header files, as well as stub
+implementation files which can be used as a basis for implementing the
+required native methods.  It is similar to @code{javah} but has
+slightly different command line options, and defaults to CNI.
+
+@c man end
+
+@ignore
+@c man begin SYNOPSIS gcjh
+gcjh [@var{OPTIONS}]@dots{} @var{CLASS}@dots{}
+@c man end
+@end ignore
+
+@c man begin OPTIONS gcjh
+
+See @code{javah} for a full description; this page only lists the
+additional options provided by @code{gcjh}.
+
+CNI text options
+@table @gcctabopt
+@item -add @var{text}
+Insert @var{text} into class body.
+@item -append @var{text}
+Append @var{text} after class declaration.
+@item -friend @var{text}
+Insert @var{text} as a @code{friend} declaration.
+@item -prepend @var{text}
+Insert @var{text} before start of class.
+@end table
+
+Compatibility options (unused)
+@table @gcctabopt
+@item -td @var{DIR}
+@itemx -M
+@itemx -MM
+@itemx -MD
+@itemx -MMD
+Unused compatibility option.
+@end table
+
+
+Standard options:
+@table @gcctabopt
+@item -help
+Print help text, then exit.
+@item -version
+Print version number, then exit.
+@item -J@var{OPTION}
+Pass argument to the Java runtime.
+@end table
+@c man end
+
+@c man begin SEEALSO gcjh
+javac(1), javah(1), @dots{}
+@c man end
+
+@comment ----------------------------------------------------------------------
+
+@node native2ascii Tool, orbd Tool, gcjh Tool, Other Tools
 @comment node-name, next, previous, up
 @section The @command{native2ascii} Tool
 @c man title gnative2ascii - An encoding converter
@@ -1553,7 +1621,8 @@ javac(1), @dots{}
 
 @c man begin DESCRIPTION grmid
 
-To be written @dots{}
+@command{rmiregistry} starts a remote object registry on the current
+host.  If no port number is specified, then port 1099 is used.
 
 @c man end