2004-07-23 Thomas Fitzsimmons <fitzsim@redhat.com>

	* Makefile.am: Rename jar binary to fastjar.
	* Makefile.in: Regenerate.
	* fastjar.texi: Rename references to jar binary with fastjar.

2004-07-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Make-lang.in: Replace rmic and rmiregistry references with
	grmic and grmiregistry.
	* gcj.texi: Likewise.

2004-07-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am: Replace jar, rmic and rmiregistry references with
	gjar, grmic and grmiregistry.
	* configure.in: Likewise.
	* Makefile.in: Regenerate.
	* configure: Likewise.
	* gcj/Makefile.in: Likewise.
	* include/Makefile.in: Likewise.
	* testsuite/Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85101 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 74 insertions, 68 deletions

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index d3ee407ac1b..7b354255e2e 100644
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-23  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* Makefile.am: Rename jar binary to fastjar.
+	* Makefile.in: Regenerate.
+	* fastjar.texi: Rename references to jar binary with fastjar.
+
 2004-07-19  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* jartool.c (main): Ensure that only one of ftruncate and _chsize
diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am
index eeff9a1af9d..901e8995d8a 100644
--- a/fastjar/Makefile.am
+++ b/fastjar/Makefile.am
@@ -45,12 +45,12 @@ AM_CPPFLAGS = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include
 
 LIBIBERTY = ../libiberty/libiberty.a
 
-bin_PROGRAMS = jar grepjar
-jar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
+bin_PROGRAMS = fastjar grepjar
+fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
 zipfile.h dostime.h compress.h pushback.h shift.h
-jar_LDADD = $(ZLIBS) $(LIBIBERTY)
-jar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
-jar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
+fastjar_LDADD = $(ZLIBS) $(LIBIBERTY)
+fastjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
+fastjar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
 
 grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h \
 zipfile.h dostime.h compress.h pushback.h
@@ -65,7 +65,7 @@ info_TEXINFOS = fastjar.texi
 fastjar_TEXINFOS = \
 	../gcc/doc/include/gcc-common.texi \
 	../gcc/doc/include/gpl.texi
-man_MANS = jar.1 grepjar.1
+man_MANS = fastjar.1 grepjar.1
 EXTRA_DIST = $(man_MANS)
 
 TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
@@ -76,10 +76,10 @@ POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
 		mv -f $(@).T$$$$ $@) || \
 		(rm -f $(@).T$$$$ && exit 1)
 
-.INTERMEDIATE: jar.pod grepjar.pod
+.INTERMEDIATE: fastjar.pod grepjar.pod
 
-jar.pod: $(srcdir)/fastjar.texi
-	-$(TEXI2POD) -D jar $< > $@
+fastjar.pod: $(srcdir)/fastjar.texi
+	-$(TEXI2POD) -D fastjar $< > $@
 
 grepjar.pod: $(srcdir)/fastjar.texi
 	-$(TEXI2POD) -D grepjar $< > $@
@@ -97,13 +97,13 @@ endif
 
 all-local: $(STAMP_GENINSRC) 
 
-stamp-geninsrc: jar.1 grepjar.1 fastjar.info
-	-cp -p $(top_builddir)/jar.1 $(srcdir)/jar.1
+stamp-geninsrc: fastjar.1 grepjar.1 fastjar.info
+	-cp -p $(top_builddir)/fastjar.1 $(srcdir)/fastjar.1
 	-cp -p $(top_builddir)/grepjar.1 $(srcdir)/grepjar.1
 	-cp -p $(top_builddir)/fastjar.info $(srcdir)/fastjar.info
 	touch $@
 
 CLEANFILES = stamp-geninsrc
-MAINTAINERCLEANFILES = $(srcdir)/jar.1 \
+MAINTAINERCLEANFILES = $(srcdir)/fastjar.1 \
                        $(srcdir)/grepjar.1 \
                        $(srcdir)/fastjar.info
diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in
index bcbb3c7ef28..2bef6898446 100644
--- a/fastjar/Makefile.in
+++ b/fastjar/Makefile.in
@@ -16,7 +16,7 @@
 
 # Process this with automake to create Makefile.in
 
-SOURCES = $(grepjar_SOURCES) $(jar_SOURCES)
+SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -38,7 +38,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = jar$(EXEEXT) grepjar$(EXEEXT)
+bin_PROGRAMS = fastjar$(EXEEXT) grepjar$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(fastjar_TEXINFOS) \
 	$(srcdir)/../compile $(srcdir)/../install-sh \
@@ -59,15 +59,15 @@ CONFIG_CLEAN_FILES = install-defs.sh
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
+am_fastjar_OBJECTS = fastjar-jartool.$(OBJEXT) \
+	fastjar-dostime.$(OBJEXT) fastjar-compress.$(OBJEXT) \
+	fastjar-pushback.$(OBJEXT) fastjar-shift.$(OBJEXT)
+fastjar_OBJECTS = $(am_fastjar_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = ../libiberty/libiberty.a
 am_grepjar_OBJECTS = jargrep.$(OBJEXT) dostime.$(OBJEXT) \
 	compress.$(OBJEXT) pushback.$(OBJEXT)
 grepjar_OBJECTS = $(am_grepjar_OBJECTS)
-am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = ../libiberty/libiberty.a
-am_jar_OBJECTS = jar-jartool.$(OBJEXT) jar-dostime.$(OBJEXT) \
-	jar-compress.$(OBJEXT) jar-pushback.$(OBJEXT) \
-	jar-shift.$(OBJEXT)
-jar_OBJECTS = $(am_jar_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp =
 am__depfiles_maybe =
@@ -75,8 +75,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(grepjar_SOURCES) $(jar_SOURCES)
-DIST_SOURCES = $(grepjar_SOURCES) $(jar_SOURCES)
+SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES)
+DIST_SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES)
 INFO_DEPS = $(srcdir)/fastjar.info
 am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include
 DVIS = fastjar.dvi
@@ -229,12 +229,12 @@ AM_MAKEFLAGS = \
 
 AM_CPPFLAGS = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include
 LIBIBERTY = ../libiberty/libiberty.a
-jar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
+fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
 zipfile.h dostime.h compress.h pushback.h shift.h
 
-jar_LDADD = $(ZLIBS) $(LIBIBERTY)
-jar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
-jar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
+fastjar_LDADD = $(ZLIBS) $(LIBIBERTY)
+fastjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
+fastjar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
 grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h \
 zipfile.h dostime.h compress.h pushback.h
 
@@ -248,7 +248,7 @@ fastjar_TEXINFOS = \
 	../gcc/doc/include/gcc-common.texi \
 	../gcc/doc/include/gpl.texi
 
-man_MANS = jar.1 grepjar.1
+man_MANS = fastjar.1 grepjar.1
 EXTRA_DIST = $(man_MANS)
 TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
 POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
@@ -260,7 +260,7 @@ POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
 # --enable-generated-files-in-srcdir in the configure script.
 @GENINSRC_TRUE@STAMP_GENINSRC = stamp-geninsrc
 CLEANFILES = stamp-geninsrc
-MAINTAINERCLEANFILES = $(srcdir)/jar.1 \
+MAINTAINERCLEANFILES = $(srcdir)/fastjar.1 \
                        $(srcdir)/grepjar.1 \
                        $(srcdir)/fastjar.info
 
@@ -344,12 +344,12 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+fastjar$(EXEEXT): $(fastjar_OBJECTS) $(fastjar_DEPENDENCIES) 
+	@rm -f fastjar$(EXEEXT)
+	$(LINK) $(fastjar_LDFLAGS) $(fastjar_OBJECTS) $(fastjar_LDADD) $(LIBS)
 grepjar$(EXEEXT): $(grepjar_OBJECTS) $(grepjar_DEPENDENCIES) 
 	@rm -f grepjar$(EXEEXT)
 	$(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS)
-jar$(EXEEXT): $(jar_OBJECTS) $(jar_DEPENDENCIES) 
-	@rm -f jar$(EXEEXT)
-	$(LINK) $(jar_LDFLAGS) $(jar_OBJECTS) $(jar_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -363,35 +363,35 @@ distclean-compile:
 .c.obj:
 	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-jar-jartool.o: jartool.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-jartool.o `test -f 'jartool.c' || echo '$(srcdir)/'`jartool.c
+fastjar-jartool.o: jartool.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-jartool.o `test -f 'jartool.c' || echo '$(srcdir)/'`jartool.c
 
-jar-jartool.obj: jartool.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-jartool.obj `if test -f 'jartool.c'; then $(CYGPATH_W) 'jartool.c'; else $(CYGPATH_W) '$(srcdir)/jartool.c'; fi`
+fastjar-jartool.obj: jartool.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-jartool.obj `if test -f 'jartool.c'; then $(CYGPATH_W) 'jartool.c'; else $(CYGPATH_W) '$(srcdir)/jartool.c'; fi`
 
-jar-dostime.o: dostime.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-dostime.o `test -f 'dostime.c' || echo '$(srcdir)/'`dostime.c
+fastjar-dostime.o: dostime.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-dostime.o `test -f 'dostime.c' || echo '$(srcdir)/'`dostime.c
 
-jar-dostime.obj: dostime.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-dostime.obj `if test -f 'dostime.c'; then $(CYGPATH_W) 'dostime.c'; else $(CYGPATH_W) '$(srcdir)/dostime.c'; fi`
+fastjar-dostime.obj: dostime.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-dostime.obj `if test -f 'dostime.c'; then $(CYGPATH_W) 'dostime.c'; else $(CYGPATH_W) '$(srcdir)/dostime.c'; fi`
 
-jar-compress.o: compress.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-compress.o `test -f 'compress.c' || echo '$(srcdir)/'`compress.c
+fastjar-compress.o: compress.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-compress.o `test -f 'compress.c' || echo '$(srcdir)/'`compress.c
 
-jar-compress.obj: compress.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-compress.obj `if test -f 'compress.c'; then $(CYGPATH_W) 'compress.c'; else $(CYGPATH_W) '$(srcdir)/compress.c'; fi`
+fastjar-compress.obj: compress.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-compress.obj `if test -f 'compress.c'; then $(CYGPATH_W) 'compress.c'; else $(CYGPATH_W) '$(srcdir)/compress.c'; fi`
 
-jar-pushback.o: pushback.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-pushback.o `test -f 'pushback.c' || echo '$(srcdir)/'`pushback.c
+fastjar-pushback.o: pushback.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-pushback.o `test -f 'pushback.c' || echo '$(srcdir)/'`pushback.c
 
-jar-pushback.obj: pushback.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-pushback.obj `if test -f 'pushback.c'; then $(CYGPATH_W) 'pushback.c'; else $(CYGPATH_W) '$(srcdir)/pushback.c'; fi`
+fastjar-pushback.obj: pushback.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-pushback.obj `if test -f 'pushback.c'; then $(CYGPATH_W) 'pushback.c'; else $(CYGPATH_W) '$(srcdir)/pushback.c'; fi`
 
-jar-shift.o: shift.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-shift.o `test -f 'shift.c' || echo '$(srcdir)/'`shift.c
+fastjar-shift.o: shift.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-shift.o `test -f 'shift.c' || echo '$(srcdir)/'`shift.c
 
-jar-shift.obj: shift.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jar-shift.obj `if test -f 'shift.c'; then $(CYGPATH_W) 'shift.c'; else $(CYGPATH_W) '$(srcdir)/shift.c'; fi`
+fastjar-shift.obj: shift.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fastjar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastjar-shift.obj `if test -f 'shift.c'; then $(CYGPATH_W) 'shift.c'; else $(CYGPATH_W) '$(srcdir)/shift.c'; fi`
 
 .texi.info:
 	restore=: && \
@@ -854,18 +854,18 @@ uninstall-man: uninstall-man1
 		mv -f $(@).T$$$$ $@) || \
 		(rm -f $(@).T$$$$ && exit 1)
 
-.INTERMEDIATE: jar.pod grepjar.pod
+.INTERMEDIATE: fastjar.pod grepjar.pod
 
-jar.pod: $(srcdir)/fastjar.texi
-	-$(TEXI2POD) -D jar $< > $@
+fastjar.pod: $(srcdir)/fastjar.texi
+	-$(TEXI2POD) -D fastjar $< > $@
 
 grepjar.pod: $(srcdir)/fastjar.texi
 	-$(TEXI2POD) -D grepjar $< > $@
 
 all-local: $(STAMP_GENINSRC) 
 
-stamp-geninsrc: jar.1 grepjar.1 fastjar.info
-	-cp -p $(top_builddir)/jar.1 $(srcdir)/jar.1
+stamp-geninsrc: fastjar.1 grepjar.1 fastjar.info
+	-cp -p $(top_builddir)/fastjar.1 $(srcdir)/fastjar.1
 	-cp -p $(top_builddir)/grepjar.1 $(srcdir)/grepjar.1
 	-cp -p $(top_builddir)/fastjar.info $(srcdir)/fastjar.info
 	touch $@
diff --git a/fastjar/fastjar.texi b/fastjar/fastjar.texi
index e07b37a8ce4..5fb856c46e0 100644
--- a/fastjar/fastjar.texi
+++ b/fastjar/fastjar.texi
@@ -24,7 +24,7 @@
 
 @dircategory Individual utilities
 @direntry
-* jar: (fastjar)Invoking jar.
+* fastjar: (fastjar)Invoking fastjar.
                             An archive tool for Java archives
 * grepjar: (fastjar)Invoking grepjar.
                             Search files in a jar file for a pattern
@@ -74,20 +74,20 @@ section entitled ``GNU General Public License''.
 @node Top
 @top Introduction
 
-This manual describes how to use @command{jar} and @command{grepjar}.
+This manual describes how to use @command{fastjar} and @command{grepjar}.
 
 @menu
-* Invoking jar::	Options supported by @command{jar}
+* Invoking fastjar::	Options supported by @command{fastjar}
 * Invoking grepjar::    Options supported by @command{grepjar}
 * Copying::		The GNU General Public License
 @end menu
 
-@node Invoking jar
-@chapter Invoking jar
+@node Invoking fastjar
+@chapter Invoking fastjar
 
-@c man title jar archive tool for Java archives
+@c man title fastjar archive tool for Java archives
 
-@c man begin DESCRIPTION jar
+@c man begin DESCRIPTION fastjar
 
 @code{fastjar} is an implementation of Sun's jar utility that comes with
 the JDK, written entirely in C, and runs in a fraction of the time while
@@ -100,16 +100,16 @@ the same order the @option{-m} and @option{-f} flags are specified.
 @c man end
 
 @ignore
-@c man begin SYNOPSIS jar
-jar @option{-ctxu} [@option{OPTIONS}] [@var{jar-file}] [@var{manifest-file}] [@option{-C} @var{dir}] @var{files}@dots{}
+@c man begin SYNOPSIS fastjar
+fastjar @option{-ctxu} [@option{OPTIONS}] [@var{jar-file}] [@var{manifest-file}] [@option{-C} @var{dir}] @var{files}@dots{}
 @c man end
-@c man begin SEEALSO jar
+@c man begin SEEALSO fastjar
 gcj(1), gij(1), grepjar(1)
 and the Info entry for @file{gcj}.
 @c man end
 @end ignore
 
-@c man begin OPTIONS jar
+@c man begin OPTIONS fastjar
 
 Exactly one of the following actions must be specified:
 
@@ -189,7 +189,7 @@ a pattern.
 grepjar [@option{-bcinsw}] @option{-e} @var{PATTERN} | @var{PATTERN} @var{files}@dots{}
 @c man end
 @c man begin SEEALSO grepjar
-jar(1), gcj(1), gij(1), gfdl(7) and the Info entry for @file{gcj}.
+fastjar(1), gcj(1), gij(1), gfdl(7) and the Info entry for @file{gcj}.
 @c man end
 @end ignore