* gcc.c (option_map): New flag -no-canonical-prefixes.

[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index c7b2272..4e2c89f 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -72,6 +72,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(top_srcdir)/contrib/aot-compile-rpm.in \
        $(top_srcdir)/contrib/aot-compile.in \
        $(top_srcdir)/contrib/aotcompile.py.in \
+       $(top_srcdir)/contrib/generate-cacerts.pl.in \
        $(top_srcdir)/contrib/rebuild-gcj-db.in \
        $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_19 = gen-from-JIS
@@ -111,9 +112,10 @@ CONFIG_HEADER = $(top_builddir)/include/config.h \
        $(top_builddir)/gcj/libgcj-config.h
 CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
        contrib/aotcompile.py contrib/aot-compile \
-       contrib/aot-compile-rpm contrib/rebuild-gcj-db scripts/jar \
-       java/io/natFile.cc java/lang/natConcreteProcess.cc \
-       java/net/natVMInetAddress.cc java/net/natVMNetworkInterface.cc \
+       contrib/aot-compile-rpm contrib/generate-cacerts.pl \
+       contrib/rebuild-gcj-db scripts/jar java/io/natFile.cc \
+       java/lang/natConcreteProcess.cc java/net/natVMInetAddress.cc \
+       java/net/natVMNetworkInterface.cc \
        gnu/java/net/natPlainSocketImpl.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
        gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
@@ -743,7 +745,6 @@ PKG_CONFIG = @PKG_CONFIG@
 PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
 SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
 SDK_LIB_DIR = @SDK_LIB_DIR@
 SDK_LNK = @SDK_LNK@
@@ -1029,8 +1030,17 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \
        $(libgcj_la_LIBADD) $(am__append_18)
 libgcj_la_LINK = $(LIBLINK)
 EXTRA_libgcj_la_SOURCES = java/lang/Object.java
+
+# We compile libgcj_tools with -findirect-dispatch so that they can
+# depend on external classes: in particular, gjdoc uses antlr.  In
+# addition, -fno-bootstrap-classes ensures that the tools are loaded
+# by the system class loader rather than the bootstrap class loader:
+# only core library classes should be loaded by the bootstrap loader.
 libgcj_tools_la_SOURCES = classpath/tools/tools.zip
-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
+ -fno-bootstrap-classes -fno-indirect-classes \
+ -fsource-filename=$(here)/classpath/tools/all-classes.lst
+
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
@@ -8687,6 +8697,8 @@ contrib/aot-compile: $(top_builddir)/config.status $(top_srcdir)/contrib/aot-com
        cd $(top_builddir) && $(SHELL) ./config.status $@
 contrib/aot-compile-rpm: $(top_builddir)/config.status $(top_srcdir)/contrib/aot-compile-rpm.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+contrib/generate-cacerts.pl: $(top_builddir)/config.status $(top_srcdir)/contrib/generate-cacerts.pl.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 contrib/rebuild-gcj-db: $(top_builddir)/config.status $(top_srcdir)/contrib/rebuild-gcj-db.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 scripts/jar: $(top_builddir)/config.status $(top_srcdir)/scripts/jar.in
@@ -12434,7 +12446,6 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/javah; \
-@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -12486,7 +12497,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@          done; \
 @CREATE_JAVA_HOME_TRUE@        cd $$working_dir; \
 @CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
-@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/security); \
 @CREATE_JAVA_HOME_TRUE@        cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 @CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/classpath.security java.security; \
@@ -12516,7 +12527,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
 @CREATE_JAVA_HOME_TRUE@        for headername in jawt jni; do \
-@CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
+@CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
 @CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)); \
@@ -12524,7 +12535,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
 @CREATE_JAVA_HOME_TRUE@        done; \
 @CREATE_JAVA_HOME_TRUE@        for headername in jawt_md jni_md; do \
-@CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
+@CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
 @CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
@@ -12532,9 +12543,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 @CREATE_JAVA_HOME_TRUE@        done; \
 @CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
-@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
-@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/src-$(gcc_version).zip \
-@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
 
 maintainer-check: libgcj.la
        $(NM) .libs/libgcj.a | grep ' T ' \