From 23bf2a5fdeeaeb3fb5f4da81cb37f8c908146ccc Mon Sep 17 00:00:00 2001 From: fitzsim Date: Sat, 17 Mar 2007 05:36:18 +0000 Subject: 2007-03-17 Thomas Fitzsimmons * resource/com/sun/tools/javac/messages.properties (Main.FailedToRead, Main.MalformedURL, Main.FailedToLoad): Clarify messages for when --with-ecj-jar is not specified. * configure.ac (FOUND_ECJ_JAR): Remove conditional. * tools/Makefile.am: Build com.sun.tools.javac package unconditionally. * configure, doc/api/Makefile.in, doc/Makefile.in, examples/Makefile.in, external/jsr166/Makefile.in, external/Makefile.in, external/relaxngDatatype/Makefile.in, external/sax/Makefile.in, external/w3c_dom/Makefile.in, include/Makefile.in, lib/Makefile.in, Makefile.in, native/fdlibm/Makefile.in, native/jawt/Makefile.in, native/jni/classpath/Makefile.in, native/jni/gconf-peer/Makefile.in, native/jni/gtk-peer/Makefile.in, native/jni/java-io/Makefile.in, native/jni/java-lang/Makefile.in, native/jni/java-net/Makefile.in, native/jni/java-nio/Makefile.in, native/jni/java-util/Makefile.in, native/jni/Makefile.in, native/jni/midi-alsa/Makefile.in, native/jni/midi-dssi/Makefile.in, native/jni/native-lib/Makefile.in, native/jni/qt-peer/Makefile.in, native/jni/xmlj/Makefile.in, native/Makefile.in, native/plugin/Makefile.in, resource/Makefile.in, scripts/Makefile.in, tools/Makefile.in: Regenerate. * tools/classes/com/sun/tools/javac: New directory. * tools/classes/com/sun/tools/javac/Main.class, tools/classes/com/sun/tools/javac/Messages.class: New files. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123015 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/tools/Makefile.am | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'libjava/classpath/tools/Makefile.am') diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 22f0d026d7b..6011ba64173 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -16,16 +16,6 @@ error dunno how to setup the JCOMPILER and compile endif endif -if FOUND_ECJ_JAR -COM_SUN_TOOLS_JAVAC = com/sun/tools/javac -ABS_COM_SUN_TOOLS_JAVAC = $(srcdir)/$(COM_SUN_TOOLS_JAVAC) -ABS_COM_SUN_TOOLS_JAVAC_SRCS = $(ABS_COM_SUN_TOOLS_JAVAC)/*.java -else -COM_SUN_TOOLS_JAVAC = -ABS_COM_SUN_TOOLS_JAVAC = -ABS_COM_SUN_TOOLS_JAVAC_SRCS = -endif - if CREATE_WRAPPERS bin_SCRIPTS = bin_PROGRAMS = gappletviewer gjarsigner gkeytool \ @@ -113,7 +103,7 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ $(srcdir)/com/sun/javadoc/*.java \ $(srcdir)/com/sun/tools/doclets/*.java \ - $(ABS_COM_SUN_TOOLS_JAVAC_SRCS) \ + $(srcdir)/com/sun/tools/javac/*.java \ $(srcdir)/sun/rmi/rmic/*.java \ $(srcdir)/external/asm/org/objectweb/asm/*.java \ $(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \ @@ -171,7 +161,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) find $(srcdir)/gnu/classpath/tools \ $(srcdir)/com/sun/javadoc \ $(srcdir)/com/sun/tools/doclets \ - $(ABS_COM_SUN_TOOLS_JAVAC) \ + $(srcdir)/com/sun/tools/javac \ $(srcdir)/sun/rmi/rmic \ -name '*.java' -print > classes.lst if [ -f $(top_builddir)/../vm-tools-packages ]; then \ @@ -190,7 +180,7 @@ if JAVA_MAINTAINER_MODE $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst ## Copy over tools resource files. @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ - com/sun/javadoc com/sun/tools/doclets $(COM_SUN_TOOLS_JAVAC) \ + com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \ sun/rmi/rmic -name \*.properties -print`; \ for p in $$list; do \ dirname=classes/`dirname $$p`; \ -- cgit v1.2.3