diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2007-03-17 00:01:47 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2007-03-17 00:01:47 +0000 |
| commit | 61e115e8d812567d95c5cdf2636c102d3a8cfdb0 (patch) | |
| tree | d763887399c28a0eadfd66b0f7b3a208f47e671e /tools | |
| parent | 428cbdff665fa20bfe9e0eb17d8ecd19b65445a5 (diff) | |
| download | classpath-61e115e8d812567d95c5cdf2636c102d3a8cfdb0.tar.gz | |
2007-03-16 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure.ac (FOUND_ECJ_JAR): Remove conditional.
* tools/Makefile.am: Build com.sun.tools.javac package
unconditionally.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index c1c5791b6..8c02fe9c3 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -14,16 +14,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 \ @@ -112,7 +102,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,14 +161,14 @@ $(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 $(JCOMPILER) -g -d classes @classes.lst cat classes.lst asm.lst > all-classes.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`; \ |