Skip to content

R
riscv-gcc-1
Commit fa5b690a by Tom Tromey Committed by Tom Tromey
Options

Makefile.in: Rebuilt. 

	* Makefile.in: Rebuilt.
	* Makefile.am (hack1): Removed.
	(awto_files): Likewise.
	(libgcjawt_la_SOURCES): Likewise.
	(EXTRA_libgcjawt_la_SOURCES): Likewise.
	(libgcjawt_la_DEPENDENCIES): Likewise.
	(libgcjawt_la_LIBADD): Likewise.
	(libgcjawt_la_LDFLAGS): Likewise.
	(libgcjawt_la_LINK): Likewise.
	($(awt_java_source_files:.java=.class)): Likewise.
	(libgcj.zip): Don't depend on AWT files.
	(MOSTLYCLEANFILES): Don't include AWT files.
	($(awto_files)): Removed.
	(nat_headers): Removed AWT files.
	(cond_awt_java_source_files): Removed.
	(ordinary_java_source_files): Added awt_java_source_files.
	* libgcj.spec.in (*lib): Removed -lgcjawt.
	* configure: Rebuilt.
	* configure.in: Removed --enable-java-awt option.

From-SVN: r34058
parent 13462862
Showing with 39 additions and 74 deletions
libjava/ChangeLog
2000-05-20 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
* Makefile.am (hack1): Removed.
(awto_files): Likewise.
(libgcjawt_la_SOURCES): Likewise.
(EXTRA_libgcjawt_la_SOURCES): Likewise.
(libgcjawt_la_DEPENDENCIES): Likewise.
(libgcjawt_la_LIBADD): Likewise.
(libgcjawt_la_LDFLAGS): Likewise.
(libgcjawt_la_LINK): Likewise.
($(awt_java_source_files:.java=.class)): Likewise.
(libgcj.zip): Don't depend on AWT files.
(MOSTLYCLEANFILES): Don't include AWT files.
($(awto_files)): Removed.
(nat_headers): Removed AWT files.
(cond_awt_java_source_files): Removed.
(ordinary_java_source_files): Added awt_java_source_files.
* libgcj.spec.in (*lib): Removed -lgcjawt.
* configure: Rebuilt.
* configure.in: Removed --enable-java-awt option.
2000-05-20 Bryce McKinlay <bryce@albatross.co.nz> 2000-05-20 Bryce McKinlay <bryce@albatross.co.nz>
* java/util/zip/ZipEntry.java: Implement Cloneable, per JDK1.2 docs. * java/util/zip/ZipEntry.java: Implement Cloneable, per JDK1.2 docs.
......
libjava/Makefile.am
...@@ -23,11 +23,7 @@ toolexecdir = $(exec_prefix)/$(target_alias) ...@@ -23,11 +23,7 @@ toolexecdir = $(exec_prefix)/$(target_alias)
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
endif endif
## Some versions of automake can't handle a conditional _LTLIBRARIES. toolexeclib_LTLIBRARIES = libgcj.la
if AWT
hack1 = libgcjawt.la
endif
toolexeclib_LTLIBRARIES = libgcj.la $(hack1)
toolexeclib_DATA = libgcj.spec toolexeclib_DATA = libgcj.spec
data_DATA = libgcj.zip data_DATA = libgcj.zip
...@@ -119,8 +115,6 @@ c_files = $(c_source_files:.c=.lo) ...@@ -119,8 +115,6 @@ c_files = $(c_source_files:.c=.lo)
javao_files = $(java_source_files:.java=.lo) \ javao_files = $(java_source_files:.java=.lo) \
$(built_java_source_files:.java=.lo) $(built_java_source_files:.java=.lo)
awto_files = $(awt_java_source_files:.java=.lo)
## Extract the libffi object file names. ## Extract the libffi object file names.
libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'`
...@@ -138,15 +132,6 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ ...@@ -138,15 +132,6 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj_la_LINK = $(LIBLINK) libgcj_la_LINK = $(LIBLINK)
libgcjawt_la_SOURCES = ## Nothing
EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files)
libgcjawt_la_DEPENDENCIES = libgcj.zip $(awto_files)
libgcjawt_la_LIBADD = $(awto_files)
libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
## The mysterious backslash is consumed by make.
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcjawt_la_LINK = $(LIBLINK)
## Make the .class files depend on the .zip file. This seems ## Make the .class files depend on the .zip file. This seems
## backwards, but is right. This doesn't catch all the .class files, ## backwards, but is right. This doesn't catch all the .class files,
## but that is ok, because the ones it fails to pick up are defined in ## but that is ok, because the ones it fails to pick up are defined in
...@@ -154,7 +139,6 @@ libgcjawt_la_LINK = $(LIBLINK) ...@@ -154,7 +139,6 @@ libgcjawt_la_LINK = $(LIBLINK)
## only want to create headers for those files which do not have ## only want to create headers for those files which do not have
## hand-maintained headers. ## hand-maintained headers.
$(java_source_files:.java=.class): libgcj.zip $(java_source_files:.java=.class): libgcj.zip
$(awt_java_source_files:.java=.class): libgcj.zip
## FIXME: this isn't really correct. ## FIXME: this isn't really correct.
$(built_java_source_files:.java=.class): $(built_java_source_files) $(built_java_source_files:.java=.class): $(built_java_source_files)
...@@ -170,7 +154,7 @@ $(built_java_source_files:.java=.class): $(built_java_source_files) ...@@ -170,7 +154,7 @@ $(built_java_source_files:.java=.class): $(built_java_source_files)
## up-to-date, and foo.class is removed, and bar.java is touched, then ## up-to-date, and foo.class is removed, and bar.java is touched, then
## `make libgcj.zip' will not rebuilt foo.class. That's because ## `make libgcj.zip' will not rebuilt foo.class. That's because
## libgcj.zip is not out-of-date with respect to foo.java. ## libgcj.zip is not out-of-date with respect to foo.java.
libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) libgcj.zip: $(java_source_files)
## FIXME: this ought to depend on built_java_source_files, but right ## FIXME: this ought to depend on built_java_source_files, but right
## now it can't. Ugly. ## now it can't. Ugly.
$(MAKE) $(built_java_source_files:.java=.class) $(MAKE) $(built_java_source_files:.java=.class)
...@@ -183,8 +167,7 @@ libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) ...@@ -183,8 +167,7 @@ libgcj.zip: $(java_source_files) $(cond_awt_java_source_files)
## Note that we explicitly want to include directory information. ## Note that we explicitly want to include directory information.
$(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/' $(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/'
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) \ MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files)
$(awto_files)
CLEANFILES = libgcj.zip CLEANFILES = libgcj.zip
clean-local: clean-local:
...@@ -216,10 +199,10 @@ $(c_files): %.lo: %.c ...@@ -216,10 +199,10 @@ $(c_files): %.lo: %.c
$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
## FIXME: GNU make. ## FIXME: GNU make.
$(awto_files) $(javao_files): %.lo: %.java $(javao_files): %.lo: %.java
$(GCJCOMPILE) -o $@ $< $(GCJCOMPILE) -o $@ $<
$(awto_files) $(javao_files): libgcj.zip $(javao_files): libgcj.zip
## ################################################################ ## ################################################################
...@@ -234,7 +217,6 @@ $(awto_files) $(javao_files): libgcj.zip ...@@ -234,7 +217,6 @@ $(awto_files) $(javao_files): libgcj.zip
## Header files used when compiling some of the nat* files. ## Header files used when compiling some of the nat* files.
nat_headers = $(ordinary_java_source_files:.java=.h) \ nat_headers = $(ordinary_java_source_files:.java=.h) \
$(built_java_source_files:.java=.h) \ $(built_java_source_files:.java=.h) \
$(cond_awt_java_source_files:.java=.h) \
java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectOutputStream$$PutField.h \
java/io/ObjectInputStream$$GetField.h java/io/ObjectInputStream$$GetField.h
...@@ -579,21 +561,17 @@ java/awt/ActiveEvent.java \ ...@@ -579,21 +561,17 @@ java/awt/ActiveEvent.java \
java/awt/Rectangle.java \ java/awt/Rectangle.java \
java/awt/IllegalComponentStateException.java java/awt/IllegalComponentStateException.java
if AWT
cond_awt_java_source_files = $(awt_java_source_files)
else
cond_awt_java_source_files =
endif
## Java files which are created by configure and thus are in the build ## Java files which are created by configure and thus are in the build
## directory. ## directory.
built_java_source_files = java/lang/ConcreteProcess.java built_java_source_files = java/lang/ConcreteProcess.java
## List of all .java files to be compiled. Please keep this list ## List of all .java files to be compiled. Please keep this list
## alphabetical. Please put files from gnu/gcj/convert into ## alphabetical. Please put files from gnu/gcj/convert into
## convert_source_files. If the .java file has a hand-maintained ## convert_source_files and files from java/awt into
## awt_java_source_files. If the .java file has a hand-maintained
## header, please list it in special_java_source_files. ## header, please list it in special_java_source_files.
ordinary_java_source_files = $(convert_source_files) \ ordinary_java_source_files = $(convert_source_files) \
$(awt_java_source_files) \
gnu/gcj/protocol/http/Connection.java \ gnu/gcj/protocol/http/Connection.java \
gnu/gcj/protocol/http/Handler.java \ gnu/gcj/protocol/http/Handler.java \
gnu/gcj/protocol/file/Connection.java \ gnu/gcj/protocol/file/Connection.java \
......
libjava/Makefile.in
...@@ -126,9 +126,7 @@ AUTOMAKE_OPTIONS = foreign no-installinfo ...@@ -126,9 +126,7 @@ AUTOMAKE_OPTIONS = foreign no-installinfo
@USE_LIBDIR_FALSE@toolexecdir = \ @USE_LIBDIR_FALSE@toolexecdir = \
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
@AWT_TRUE@hack1 = \ toolexeclib_LTLIBRARIES = libgcj.la
@AWT_TRUE@libgcjawt.la
toolexeclib_LTLIBRARIES = libgcj.la $(hack1)
toolexeclib_DATA = libgcj.spec toolexeclib_DATA = libgcj.spec
data_DATA = libgcj.zip data_DATA = libgcj.zip
...@@ -193,8 +191,6 @@ javao_files = $(java_source_files:.java=.lo) \ ...@@ -193,8 +191,6 @@ javao_files = $(java_source_files:.java=.lo) \
$(built_java_source_files:.java=.lo) $(built_java_source_files:.java=.lo)
awto_files = $(awt_java_source_files:.java=.lo)
libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'`
libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
...@@ -214,25 +210,13 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ ...@@ -214,25 +210,13 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj_la_LINK = $(LIBLINK) libgcj_la_LINK = $(LIBLINK)
libgcjawt_la_SOURCES = ## Nothing MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files)
EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files)
libgcjawt_la_DEPENDENCIES = libgcj.zip $(awto_files)
libgcjawt_la_LIBADD = $(awto_files)
libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcjawt_la_LINK = $(LIBLINK)
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) \
$(awto_files)
CLEANFILES = libgcj.zip CLEANFILES = libgcj.zip
SUFFIXES = .class .java .h SUFFIXES = .class .java .h
nat_headers = $(ordinary_java_source_files:.java=.h) \ nat_headers = $(ordinary_java_source_files:.java=.h) \
$(built_java_source_files:.java=.h) \ $(built_java_source_files:.java=.h) \
$(cond_awt_java_source_files:.java=.h) \
java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectOutputStream$$PutField.h \
java/io/ObjectInputStream$$GetField.h java/io/ObjectInputStream$$GetField.h
...@@ -373,13 +357,11 @@ java/awt/ActiveEvent.java \ ...@@ -373,13 +357,11 @@ java/awt/ActiveEvent.java \
java/awt/Rectangle.java \ java/awt/Rectangle.java \
java/awt/IllegalComponentStateException.java java/awt/IllegalComponentStateException.java
@AWT_TRUE@cond_awt_java_source_files = \
@AWT_TRUE@$(awt_java_source_files)
@AWT_FALSE@cond_awt_java_source_files = \
built_java_source_files = java/lang/ConcreteProcess.java built_java_source_files = java/lang/ConcreteProcess.java
ordinary_java_source_files = $(convert_source_files) \ ordinary_java_source_files = $(convert_source_files) \
$(awt_java_source_files) \
gnu/gcj/protocol/http/Connection.java \ gnu/gcj/protocol/http/Connection.java \
gnu/gcj/protocol/http/Handler.java \ gnu/gcj/protocol/http/Handler.java \
gnu/gcj/protocol/file/Connection.java \ gnu/gcj/protocol/file/Connection.java \
...@@ -914,7 +896,6 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) ...@@ -914,7 +896,6 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
libgcj_la_OBJECTS = prims.lo jni.lo exception.lo resolve.lo \ libgcj_la_OBJECTS = prims.lo jni.lo exception.lo resolve.lo \
defineclass.lo interpret.lo name-finder.lo defineclass.lo interpret.lo name-finder.lo
libgcjawt_la_OBJECTS =
@NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT)
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \ @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS$(EXEEXT) @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS$(EXEEXT)
...@@ -1307,8 +1288,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ ...@@ -1307,8 +1288,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/util/zip/ZipOutputStream.P .deps/jni.P .deps/libgcjdata.P \ .deps/java/util/zip/ZipOutputStream.P .deps/jni.P .deps/libgcjdata.P \
.deps/name-finder.P .deps/no-threads.P .deps/nogc.P \ .deps/name-finder.P .deps/no-threads.P .deps/nogc.P \
.deps/posix-threads.P .deps/prims.P .deps/resolve.P .deps/posix-threads.P .deps/prims.P .deps/resolve.P
SOURCES = $(libgcjdata_a_SOURCES) $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjawt_la_SOURCES) $(EXTRA_libgcjawt_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) SOURCES = $(libgcjdata_a_SOURCES) $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
OBJECTS = $(libgcjdata_a_OBJECTS) $(libgcj_la_OBJECTS) $(libgcjawt_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(gen_from_JIS_OBJECTS) OBJECTS = $(libgcjdata_a_OBJECTS) $(libgcj_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(gen_from_JIS_OBJECTS)
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
...@@ -1457,9 +1438,6 @@ uninstall-toolexeclibLTLIBRARIES: ...@@ -1457,9 +1438,6 @@ uninstall-toolexeclibLTLIBRARIES:
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
$(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS) $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
libgcjawt.la: $(libgcjawt_la_OBJECTS) $(libgcjawt_la_DEPENDENCIES)
$(libgcjawt_la_LINK) -rpath $(toolexeclibdir) $(libgcjawt_la_LDFLAGS) $(libgcjawt_la_OBJECTS) $(libgcjawt_la_LIBADD) $(LIBS)
mostlyclean-binPROGRAMS: mostlyclean-binPROGRAMS:
clean-binPROGRAMS: clean-binPROGRAMS:
...@@ -1892,14 +1870,13 @@ mostlyclean distclean maintainer-clean ...@@ -1892,14 +1870,13 @@ mostlyclean distclean maintainer-clean
$(java_source_files:.java=.class): libgcj.zip $(java_source_files:.java=.class): libgcj.zip
$(awt_java_source_files:.java=.class): libgcj.zip
$(built_java_source_files:.java=.class): $(built_java_source_files) $(built_java_source_files:.java=.class): $(built_java_source_files)
javac="$(JAVAC)"; \ javac="$(JAVAC)"; \
$$javac -L$(here) $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \ $$javac -L$(here) $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \
-d $(here) $? -d $(here) $?
libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) libgcj.zip: $(java_source_files)
$(MAKE) $(built_java_source_files:.java=.class) $(MAKE) $(built_java_source_files:.java=.class)
javac="$(JAVAC)"; cd $(srcdir); \ javac="$(JAVAC)"; cd $(srcdir); \
$$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \
...@@ -1927,10 +1904,10 @@ $(c_files): %.lo: %.c ...@@ -1927,10 +1904,10 @@ $(c_files): %.lo: %.c
$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
$(awto_files) $(javao_files): %.lo: %.java $(javao_files): %.lo: %.java
$(GCJCOMPILE) -o $@ $< $(GCJCOMPILE) -o $@ $<
$(awto_files) $(javao_files): libgcj.zip $(javao_files): libgcj.zip
.class.h: .class.h:
$(GCJH) -classpath $(top_builddir) $(basename $<) $(GCJH) -classpath $(top_builddir) $(basename $<)
......
libjava/configure.in
...@@ -49,18 +49,6 @@ AC_ARG_ENABLE(fast-character, ...@@ -49,18 +49,6 @@ AC_ARG_ENABLE(fast-character,
# Nothing # Nothing
, AC_DEFINE(COMPACT_CHARACTER)) , AC_DEFINE(COMPACT_CHARACTER))
AC_ARG_ENABLE(java-awt,
[ --enable-java-awt enable AWT implementation],
awt=$enable_java_awt
, [# Default to enabled on native systems.
if test -z "${with_cross_host}"; then
awt=yes
else
awt=no
fi])
AM_CONDITIONAL(AWT, test "$awt" = yes)
dnl Should the runtime set system properties by examining the dnl Should the runtime set system properties by examining the
dnl environment variable GCJ_PROPERTIES? dnl environment variable GCJ_PROPERTIES?
AC_ARG_ENABLE(getenv-properties, AC_ARG_ENABLE(getenv-properties,
......
libjava/libgcj.spec.in
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# to link with libgcj. # to link with libgcj.
# #
%rename lib liborig %rename lib liborig
*lib: -lgcjawt -lgcj -lm @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(liborig) *lib: -lgcj -lm @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(liborig)
*jc1: @DIVIDESPEC@ @EXCEPTIONSPEC@ -fasynchronous-exceptions *jc1: @DIVIDESPEC@ @EXCEPTIONSPEC@ -fasynchronous-exceptions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment