mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-18 10:59:15 +08:00
Install libgcj.jar as libgcj-VERSION.jar.
From-SVN: r52226
This commit is contained in:
Anthony Green
Anthony Green
parent
1d80248e2f
commit
395cb21141
@ -1,3 +1,11 @@
|
||||
2002-04-12 Anthony Green <green@redhat.com>
|
||||
|
||||
* Makefile.am (jardir, jar_DATA): Define (for libgcj.jar).
|
||||
Create libgcj-@gcc_version@.jar instead of libgcj.jar.
|
||||
* Makefile.in: Rebuilt.
|
||||
* configure.in: Substitute gcc_version.
|
||||
* configure: Rebuilt.
|
||||
|
||||
2002-04-11 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
* configure.host: Set can_unwind_signal on hosts which support it.
|
||||
|
||||
@ -31,7 +31,9 @@ endif
|
||||
|
||||
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
|
||||
toolexeclib_DATA = libgcj.spec
|
||||
data_DATA = libgcj.jar
|
||||
|
||||
jardir = $(datadir)/java
|
||||
jar_DATA = libgcj-@gcc_version@.jar
|
||||
|
||||
## FIXME: Using libdir violates GNU coding standards.
|
||||
secdir = $(libdir)/security
|
||||
@ -145,7 +147,7 @@ libgcj_la_LINK = $(LIBLINK)
|
||||
|
||||
libgcjx_la_SOURCES = $(x_nat_source_files)
|
||||
EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
|
||||
libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files)
|
||||
libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files)
|
||||
libgcjx_la_LIBADD = $(x_javao_files)
|
||||
libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
|
||||
-rpath $(toolexeclibdir) \
|
||||
@ -167,13 +169,13 @@ install-exec-hook:
|
||||
## a .java file with some other class which is caught. Note that we
|
||||
## only want to create headers for those files which do not have
|
||||
## hand-maintained headers.
|
||||
$(built_java_source_files:.java=.class): libgcj.jar
|
||||
$(java_source_files:.java=.class): libgcj.jar
|
||||
$(built_java_source_files:.java=.class): libgcj-@gcc_version@.jar
|
||||
$(java_source_files:.java=.class): libgcj-@gcc_version@.jar
|
||||
|
||||
## The .class files for X will not be included in libgcj.jar, but the
|
||||
## rule for libgcj.jar will cause all out-of-date .class files to be
|
||||
## built. We need this to generate headers for the nat-files.
|
||||
$(x_java_source_files:.java=.class): libgcj.jar
|
||||
$(x_java_source_files:.java=.class): libgcj-@gcc_version@.jar
|
||||
|
||||
## We have the zip file depend on the java sources and not the class
|
||||
## files, because we don't know the names of all the class files.
|
||||
@ -181,7 +183,7 @@ $(x_java_source_files:.java=.class): libgcj.jar
|
||||
## up-to-date, and foo.class is removed, and bar.java is touched, then
|
||||
## `make libgcj.jar' will not rebuilt foo.class. That's because
|
||||
## libgcj.jar is not out-of-date with respect to foo.java.
|
||||
libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_files)
|
||||
libgcj-@gcc_version@.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_files)
|
||||
## Create a list of all Java sources, without exceeding any shell limits.
|
||||
@: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$?,$(shell echo $(source) >> tmp-list))
|
||||
@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
|
||||
@ -192,14 +194,14 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
|
||||
done; \
|
||||
test "$$fail" = no)
|
||||
-@rm -f tmp-list libgcj.jar
|
||||
-@rm -f tmp-list libgcj-@gcc_version@.jar
|
||||
## Note that we explicitly want to include directory information.
|
||||
find java gnu javax org -type d -o -type f -name '*.class' | \
|
||||
sed -e '/\/\./d' -e '/\/xlib/d' | \
|
||||
$(ZIP) cfM0E@ $@
|
||||
|
||||
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
|
||||
CLEANFILES = tmp-list libgcj.jar
|
||||
CLEANFILES = tmp-list libgcj-@gcc_version@.jar
|
||||
|
||||
clean-local:
|
||||
## We just remove every .class file that was created.
|
||||
@ -384,7 +386,7 @@ maintainer-check: libgcj.la
|
||||
|
||||
## This rule can be used to see if the headers are more or less
|
||||
## correct.
|
||||
header-check: libgcj.jar $(nat_headers)
|
||||
header-check: libgcj-@gcc_version@.jar $(nat_headers)
|
||||
rm -f htest.cc; \
|
||||
for h in $(nat_headers); do \
|
||||
echo "#include \"$$h\"" >> htest.cc; \
|
||||
@ -393,7 +395,7 @@ header-check: libgcj.jar $(nat_headers)
|
||||
|
||||
## This rule can be used to see if all the .class files verify
|
||||
## correctly.
|
||||
class-check: libgcj.jar
|
||||
class-check: libgcj-@gcc_version@.jar
|
||||
@ok=0; find . -name '*.class' -print | fgrep -v testsuite | \
|
||||
while read f; do \
|
||||
echo "$(GCJ_WITH_FLAGS) --syntax-only $$f"; \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@ -121,6 +121,7 @@ ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
ZLIBTESTSPEC = @ZLIBTESTSPEC@
|
||||
gcc_version = @gcc_version@
|
||||
glibjava_CXX = @glibjava_CXX@
|
||||
here = @here@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
@ -128,40 +129,30 @@ mkinstalldirs = @mkinstalldirs@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
@TESTSUBDIR_TRUE@SUBDIRS = \
|
||||
@TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
|
||||
@TESTSUBDIR_FALSE@SUBDIRS = \
|
||||
@TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = \
|
||||
@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = \
|
||||
@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = \
|
||||
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||
@XLIB_AWT_TRUE@cond_x_ltlibrary = \
|
||||
@XLIB_AWT_TRUE@libgcjx.la
|
||||
@XLIB_AWT_FALSE@cond_x_ltlibrary = \
|
||||
@TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
|
||||
@TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||
@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la
|
||||
@XLIB_AWT_FALSE@cond_x_ltlibrary =
|
||||
|
||||
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
|
||||
toolexeclib_DATA = libgcj.spec
|
||||
data_DATA = libgcj.jar
|
||||
|
||||
jardir = $(datadir)/java
|
||||
jar_DATA = libgcj-@gcc_version@.jar
|
||||
|
||||
secdir = $(libdir)/security
|
||||
|
||||
@NATIVE_TRUE@bin_PROGRAMS = \
|
||||
@NATIVE_TRUE@jv-convert gij rmic rmiregistry
|
||||
@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
|
||||
|
||||
bin_SCRIPTS = addr2name.awk
|
||||
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \
|
||||
@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \
|
||||
@CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
|
||||
@CANADIAN_FALSE@ZIP = \
|
||||
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@GCJH = \
|
||||
@CANADIAN_TRUE@gcjh
|
||||
@CANADIAN_FALSE@GCJH = \
|
||||
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
|
||||
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
|
||||
@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
|
||||
@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
|
||||
|
||||
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
|
||||
|
||||
@ -181,10 +172,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
|
||||
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
|
||||
-DPREFIX="\"$(prefix)\""
|
||||
|
||||
@USING_GCC_TRUE@AM_CFLAGS = \
|
||||
@USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
|
||||
@USING_GCC_FALSE@AM_CFLAGS = \
|
||||
@USING_GCC_FALSE@@LIBGCJ_CFLAGS@
|
||||
@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
|
||||
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
|
||||
|
||||
JCFLAGS = -g
|
||||
JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
|
||||
@ -230,7 +219,7 @@ libgcj_la_LINK = $(LIBLINK)
|
||||
|
||||
libgcjx_la_SOURCES = $(x_nat_source_files)
|
||||
EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
|
||||
libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files)
|
||||
libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files)
|
||||
libgcjx_la_LIBADD = $(x_javao_files)
|
||||
libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
|
||||
-rpath $(toolexeclibdir) \
|
||||
@ -239,7 +228,7 @@ libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
|
||||
libgcjx_la_LINK = $(LIBLINK)
|
||||
|
||||
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
|
||||
CLEANFILES = tmp-list libgcj.jar
|
||||
CLEANFILES = tmp-list libgcj-@gcc_version@.jar
|
||||
|
||||
SUFFIXES = .class .java .h
|
||||
|
||||
@ -259,8 +248,7 @@ extra_headers = java/lang/Object.h java/lang/Class.h
|
||||
|
||||
NM = nm
|
||||
|
||||
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
|
||||
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
|
||||
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
|
||||
|
||||
CONVERT_DIR = gnu/gcj/convert
|
||||
|
||||
@ -1733,7 +1721,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DATA = $(data_DATA) $(toolexeclib_DATA)
|
||||
DATA = $(jar_DATA) $(toolexeclib_DATA)
|
||||
|
||||
DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \
|
||||
THANKS acinclude.m4 aclocal.m4 configure configure.in \
|
||||
@ -1742,7 +1730,7 @@ libgcj-test.spec.in libgcj.spec.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
|
||||
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
||||
@ -2870,23 +2858,23 @@ uninstall-binSCRIPTS:
|
||||
.cc.lo:
|
||||
$(LTCXXCOMPILE) -c $<
|
||||
|
||||
install-dataDATA: $(data_DATA)
|
||||
install-jarDATA: $(jar_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
@list='$(data_DATA)'; for p in $$list; do \
|
||||
$(mkinstalldirs) $(DESTDIR)$(jardir)
|
||||
@list='$(jar_DATA)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(jardir)/$$p"; \
|
||||
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(jardir)/$$p; \
|
||||
else if test -f $$p; then \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(jardir)/$$p"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(jardir)/$$p; \
|
||||
fi; fi; \
|
||||
done
|
||||
|
||||
uninstall-dataDATA:
|
||||
uninstall-jarDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(data_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(datadir)/$$p; \
|
||||
list='$(jar_DATA)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(jardir)/$$p; \
|
||||
done
|
||||
|
||||
install-toolexeclibDATA: $(toolexeclib_DATA)
|
||||
@ -2944,7 +2932,7 @@ maintainer-clean-recursive:
|
||||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
@ -3043,7 +3031,7 @@ distdir: $(DISTFILES)
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
if test -d $$d/$$file; then \
|
||||
cp -pr $$/$$file $(distdir)/$$file; \
|
||||
cp -pr $$d/$$file $(distdir)/$$file; \
|
||||
else \
|
||||
test -f $(distdir)/$$file \
|
||||
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||
@ -3125,14 +3113,14 @@ install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \
|
||||
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
|
||||
install-exec: install-exec-recursive
|
||||
|
||||
install-data-am: install-dataDATA install-data-local
|
||||
install-data-am: install-jarDATA install-data-local
|
||||
install-data: install-data-recursive
|
||||
|
||||
install-am: all-am
|
||||
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||
install: install-recursive
|
||||
uninstall-am: uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \
|
||||
uninstall-binSCRIPTS uninstall-dataDATA \
|
||||
uninstall-binSCRIPTS uninstall-jarDATA \
|
||||
uninstall-toolexeclibDATA
|
||||
uninstall: uninstall-recursive
|
||||
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
|
||||
@ -3142,7 +3130,7 @@ install-strip:
|
||||
installdirs: installdirs-recursive
|
||||
installdirs-am:
|
||||
$(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
|
||||
$(DESTDIR)$(bindir) $(DESTDIR)$(jardir) \
|
||||
$(DESTDIR)$(toolexeclibdir)
|
||||
|
||||
|
||||
@ -3202,7 +3190,7 @@ distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
|
||||
uninstall-binPROGRAMS install-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
||||
distclean-noinstPROGRAMS clean-noinstPROGRAMS \
|
||||
maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
|
||||
uninstall-dataDATA install-dataDATA uninstall-toolexeclibDATA \
|
||||
uninstall-jarDATA install-jarDATA uninstall-toolexeclibDATA \
|
||||
install-toolexeclibDATA install-data-recursive uninstall-data-recursive \
|
||||
install-exec-recursive uninstall-exec-recursive installdirs-recursive \
|
||||
uninstalldirs-recursive all-recursive check-recursive \
|
||||
@ -3226,12 +3214,12 @@ install-exec-hook:
|
||||
$(LN_S) libgcjx.la gnu-awt-xlib.la; \
|
||||
fi
|
||||
|
||||
$(built_java_source_files:.java=.class): libgcj.jar
|
||||
$(java_source_files:.java=.class): libgcj.jar
|
||||
$(built_java_source_files:.java=.class): libgcj-@gcc_version@.jar
|
||||
$(java_source_files:.java=.class): libgcj-@gcc_version@.jar
|
||||
|
||||
$(x_java_source_files:.java=.class): libgcj.jar
|
||||
$(x_java_source_files:.java=.class): libgcj-@gcc_version@.jar
|
||||
|
||||
libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_files)
|
||||
libgcj-@gcc_version@.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_files)
|
||||
@: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$?,$(shell echo $(source) >> tmp-list))
|
||||
@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
|
||||
javac="$(JAVAC)"; \
|
||||
@ -3241,7 +3229,7 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
|
||||
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
|
||||
done; \
|
||||
test "$$fail" = no)
|
||||
-@rm -f tmp-list libgcj.jar
|
||||
-@rm -f tmp-list libgcj-@gcc_version@.jar
|
||||
find java gnu javax org -type d -o -type f -name '*.class' | \
|
||||
sed -e '/\/\./d' -e '/\/xlib/d' | \
|
||||
$(ZIP) cfM0E@ $@
|
||||
@ -3377,14 +3365,14 @@ maintainer-check: libgcj.la
|
||||
| grep -v 'Jv' \
|
||||
| grep -v 'terminate__Fv' | grep -v 'unexpected__Fv'
|
||||
|
||||
header-check: libgcj.jar $(nat_headers)
|
||||
header-check: libgcj-@gcc_version@.jar $(nat_headers)
|
||||
rm -f htest.cc; \
|
||||
for h in $(nat_headers); do \
|
||||
echo "#include \"$$h\"" >> htest.cc; \
|
||||
done; \
|
||||
$(CXXCOMPILE) -fsyntax-only htest.cc
|
||||
|
||||
class-check: libgcj.jar
|
||||
class-check: libgcj-@gcc_version@.jar
|
||||
@ok=0; find . -name '*.class' -print | fgrep -v testsuite | \
|
||||
while read f; do \
|
||||
echo "$(GCJ_WITH_FLAGS) --syntax-only $$f"; \
|
||||
|
||||
456
libjava/configure
vendored
456
libjava/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -456,6 +456,7 @@ gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
||||
tool_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include
|
||||
changequote([,])dnl
|
||||
AC_SUBST(tool_include_dir)
|
||||
AC_SUBST(gcc_version)
|
||||
|
||||
if test -n "${with_cross_host}"; then
|
||||
# We are being configured with a cross compiler. AC_REPLACE_FUNCS
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@ -123,6 +123,7 @@ ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
ZLIBTESTSPEC = @ZLIBTESTSPEC@
|
||||
gcc_version = @gcc_version@
|
||||
glibjava_CXX = @glibjava_CXX@
|
||||
here = @here@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
@ -145,7 +146,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:
|
||||
@ -257,7 +258,7 @@ distdir: $(DISTFILES)
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
if test -d $$d/$$file; then \
|
||||
cp -pr $$/$$file $(distdir)/$$file; \
|
||||
cp -pr $$d/$$file $(distdir)/$$file; \
|
||||
else \
|
||||
test -f $(distdir)/$$file \
|
||||
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@ -123,6 +123,7 @@ ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
ZLIBTESTSPEC = @ZLIBTESTSPEC@
|
||||
gcc_version = @gcc_version@
|
||||
glibjava_CXX = @glibjava_CXX@
|
||||
here = @here@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
@ -141,7 +142,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:
|
||||
@ -238,7 +239,7 @@ distdir: $(DISTFILES)
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
if test -d $$d/$$file; then \
|
||||
cp -pr $$/$$file $(distdir)/$$file; \
|
||||
cp -pr $$d/$$file $(distdir)/$$file; \
|
||||
else \
|
||||
test -f $(distdir)/$$file \
|
||||
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2002-04-12 Anthony Green <green@redhat.com>
|
||||
|
||||
* lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj.jar.
|
||||
|
||||
2002-04-12 Loren J. Rittle <ljrittle@acm.org>
|
||||
|
||||
* libjava.lang/SyncGlobal.java, libjava.lang/SyncGlobal.out:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@ -123,6 +123,7 @@ ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
ZLIBTESTSPEC = @ZLIBTESTSPEC@
|
||||
gcc_version = @gcc_version@
|
||||
glibjava_CXX = @glibjava_CXX@
|
||||
here = @here@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
@ -150,7 +151,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
@ -178,7 +179,7 @@ distdir: $(DISTFILES)
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
if test -d $$d/$$file; then \
|
||||
cp -pr $$/$$file $(distdir)/$$file; \
|
||||
cp -pr $$d/$$file $(distdir)/$$file; \
|
||||
else \
|
||||
test -f $(distdir)/$$file \
|
||||
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||
|
||||
@ -112,6 +112,7 @@ proc libjava_init { args } {
|
||||
global TOOL_EXECUTABLE
|
||||
global original_ld_library_path
|
||||
global env objdir
|
||||
global env gcc_version
|
||||
|
||||
if { $libjava_initialized == 1 } { return; }
|
||||
|
||||
@ -127,6 +128,11 @@ proc libjava_init { args } {
|
||||
}
|
||||
}
|
||||
|
||||
# Determine the version so we can find the libgcj jar file.
|
||||
set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"]
|
||||
regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version
|
||||
verbose "jar file is libgcj-$gcc_version.jar"
|
||||
|
||||
# The -B is so we find libgcj.spec.
|
||||
set text [eval exec "$GCJ_UNDER_TEST -B$objdir/../ -v 2>@ stdout"]
|
||||
regexp -- "Thread model: (\[^\n\]+)\n" $text ignore model
|
||||
@ -222,6 +228,7 @@ proc libjava_arguments {{mode compile}} {
|
||||
global runtests
|
||||
global env
|
||||
global tool_root_dir
|
||||
global gcc_version
|
||||
|
||||
if [info exists LIBJAVA] {
|
||||
set libjava $LIBJAVA;
|
||||
@ -292,9 +299,9 @@ proc libjava_arguments {{mode compile}} {
|
||||
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
|
||||
|
||||
# Set the CLASSPATH environment variable
|
||||
verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
|
||||
verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
|
||||
global env
|
||||
set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
|
||||
set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
|
||||
|
||||
if {$mode == "link"} {
|
||||
global wrapper_file wrap_compile_flags;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user