diff options
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 11 | ||||
-rw-r--r-- | libjava/Makefile.am | 26 | ||||
-rw-r--r-- | libjava/Makefile.in | 48 | ||||
-rwxr-xr-x | libjava/configure | 8 | ||||
-rw-r--r-- | libjava/configure.in | 4 | ||||
-rw-r--r-- | libjava/gcj/Makefile.in | 2 | ||||
-rw-r--r-- | libjava/include/Makefile.in | 2 | ||||
-rw-r--r-- | libjava/testsuite/Makefile.in | 2 |
8 files changed, 57 insertions, 46 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9b467ae..a1280c7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +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. + 2004-07-23 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/net/protocol/http/Connection.java: Use GetPropertyAction diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 005c8bf..fb0db46 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -60,7 +60,7 @@ propdir = $(libdir) ## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert gij rmic rmiregistry +bin_PROGRAMS = jv-convert gij grmic grmiregistry endif bin_SCRIPTS = addr2name.awk @@ -777,29 +777,29 @@ gij_LDADD = -L$(here)/.libs libgcj.la ## linking this program. gij_DEPENDENCIES = libgcj.la libgcj.spec -rmic_SOURCES = +grmic_SOURCES = ## This is a dummy definition. -EXTRA_rmic_SOURCES = $(rmi_java_source_files) -rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ +EXTRA_grmic_SOURCES = $(rmi_java_source_files) +grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmic_LINK = $(GCJLINK) +grmic_LINK = $(GCJLINK) ## See jv_convert_LDADD. -rmic_LDADD = -L$(here)/.libs libgcj.la +grmic_LDADD = -L$(here)/.libs libgcj.la ## Depend on the spec file to make sure it is up to date before ## linking this program. -rmic_DEPENDENCIES = libgcj.la libgcj.spec +grmic_DEPENDENCIES = libgcj.la libgcj.spec -rmiregistry_SOURCES = +grmiregistry_SOURCES = ## This is a dummy definition. -EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files) -rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ +EXTRA_grmiregistry_SOURCES = $(rmi_java_source_files) +grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmiregistry_LINK = $(GCJLINK) +grmiregistry_LINK = $(GCJLINK) ## See jv_convert_LDADD. -rmiregistry_LDADD = -L$(here)/.libs libgcj.la +grmiregistry_LDADD = -L$(here)/.libs libgcj.la ## Depend on the spec file to make sure it is up to date before ## linking this program. -rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec +grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec # The Unicode consortium does not permit re-distributing the file JIS0201.TXT. # You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 9cf6bac..13f2063 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -193,7 +193,7 @@ jar_DATA = libgcj-@gcc_version@.jar secdir = $(libdir)/security propdir = $(libdir) -@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry +@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij grmic grmiregistry bin_SCRIPTS = addr2name.awk @@ -536,23 +536,23 @@ gij_LINK = $(GCJLINK) gij_LDADD = -L$(here)/.libs libgcj.la gij_DEPENDENCIES = libgcj.la libgcj.spec -rmic_SOURCES = -EXTRA_rmic_SOURCES = $(rmi_java_source_files) -rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ +grmic_SOURCES = +EXTRA_grmic_SOURCES = $(rmi_java_source_files) +grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmic_LINK = $(GCJLINK) -rmic_LDADD = -L$(here)/.libs libgcj.la -rmic_DEPENDENCIES = libgcj.la libgcj.spec +grmic_LINK = $(GCJLINK) +grmic_LDADD = -L$(here)/.libs libgcj.la +grmic_DEPENDENCIES = libgcj.la libgcj.spec -rmiregistry_SOURCES = -EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files) -rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ +grmiregistry_SOURCES = +EXTRA_grmiregistry_SOURCES = $(rmi_java_source_files) +grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmiregistry_LINK = $(GCJLINK) -rmiregistry_LDADD = -L$(here)/.libs libgcj.la -rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec +grmiregistry_LINK = $(GCJLINK) +grmiregistry_LDADD = -L$(here)/.libs libgcj.la +grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec gen_from_JIS_SOURCES = EXTRA_gen_from_JIS_SOURCES = $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \ @@ -3059,15 +3059,15 @@ gnu/gcj/xlib/natXConfigureEvent.lo gnu/gcj/xlib/natXException.lo \ gnu/gcj/xlib/natXExposeEvent.lo gnu/gcj/xlib/natXImage.lo \ gnu/gcj/xlib/natXUnmapEvent.lo @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \ -@NATIVE_TRUE@rmic$(EXEEXT) rmiregistry$(EXEEXT) +@NATIVE_TRUE@grmic$(EXEEXT) grmiregistry$(EXEEXT) @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \ @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) jv_convert_OBJECTS = gij_OBJECTS = gij.$(OBJEXT) -rmic_OBJECTS = -rmiregistry_OBJECTS = +grmic_OBJECTS = +grmiregistry_OBJECTS = gen_from_JIS_OBJECTS = gen_from_JIS_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) @@ -4902,8 +4902,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \ .deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \ .deps/win32-threads.P .deps/win32.P -SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgij_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) -OBJECTS = $(libgcj_la_OBJECTS) $(libgij_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) +SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgij_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(EXTRA_grmic_SOURCES) $(grmiregistry_SOURCES) $(EXTRA_grmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) +OBJECTS = $(libgcj_la_OBJECTS) $(libgij_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(grmic_OBJECTS) $(grmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) all: all-redirect .SUFFIXES: @@ -5047,13 +5047,13 @@ gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) @rm -f gij$(EXEEXT) $(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS) -rmic$(EXEEXT): $(rmic_OBJECTS) $(rmic_DEPENDENCIES) - @rm -f rmic$(EXEEXT) - $(rmic_LINK) $(rmic_LDFLAGS) $(rmic_OBJECTS) $(rmic_LDADD) $(LIBS) +grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) + @rm -f grmic$(EXEEXT) + $(grmic_LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS) -rmiregistry$(EXEEXT): $(rmiregistry_OBJECTS) $(rmiregistry_DEPENDENCIES) - @rm -f rmiregistry$(EXEEXT) - $(rmiregistry_LINK) $(rmiregistry_LDFLAGS) $(rmiregistry_OBJECTS) $(rmiregistry_LDADD) $(LIBS) +grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) + @rm -f grmiregistry$(EXEEXT) + $(grmiregistry_LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS) gen-from-JIS$(EXEEXT): $(gen_from_JIS_OBJECTS) $(gen_from_JIS_DEPENDENCIES) @rm -f gen-from-JIS$(EXEEXT) diff --git a/libjava/configure b/libjava/configure index 50339f8..0795cf1 100755 --- a/libjava/configure +++ b/libjava/configure @@ -1664,7 +1664,7 @@ else if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -7186,7 +7186,7 @@ case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh' - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar' + ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then @@ -7203,7 +7203,7 @@ case "${which_gcj}" in GCJ="gcj -B`${PWDCMD-pwd}`/" ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar' + ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' GCJH=gcjh ;; esac @@ -9272,7 +9272,7 @@ if test "$no_recursion" != yes; then fi fi - cd "$ac_popdir" + cd $ac_popdir done fi diff --git a/libjava/configure.in b/libjava/configure.in index a1bcd64..47773fe 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -1092,7 +1092,7 @@ case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh' - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar' + ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then @@ -1109,7 +1109,7 @@ case "${which_gcj}" in GCJ="gcj -B`${PWDCMD-pwd}`/" ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar' + ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' GCJH=gcjh ;; esac diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 9402129..2d39365 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -178,7 +178,7 @@ DIST_COMMON = ./stamp-h2.in Makefile.am Makefile.in libgcj-config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index d00ce1d..6c0f2a0 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -174,7 +174,7 @@ DIST_COMMON = ./stamp-h1.in Makefile.am Makefile.in config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 83a4b77..1a0f6cf 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -183,7 +183,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: |