summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-09-15 00:32:57 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-09-15 00:32:57 +0000
commitf3b882e136b4b0da2d86ef2f714d713a02baa40e (patch)
treee3bcc0293ad36a51c533430d4ffcbfa79624a7af /tools
parent1e7e1ba4f8868f7569394ad343e5468c9ce315fe (diff)
downloadclasspath-f3b882e136b4b0da2d86ef2f714d713a02baa40e.tar.gz
Simplify compilation with antlr.jar.
2008-09-15 Andrew John Hughes <gnu_andrew@member.fsf.org> Reported by: Matthias Klose * tools/Makefile.am: Simplify the addition of the ANTLR JAR file to the classpath.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/Makefile.am14
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 24a8a2dd8..e39c3b466 100755
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,11 @@
## Input file for automake to generate the Makefile.in used by configure
+if CREATE_GJDOC
+ANTLR_CLASSPATH = $(ANTLR_JAR):generated
+endif
+
GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib'
-GLIBJ_CLASSPATH=asm
+GLIBJ_CLASSPATH=asm:$(ANTLR_CLASSPATH)
# Setup the compiler to use the GNU Classpath library we just built.
if GCJ_JAVAC
@@ -10,12 +14,6 @@ else
JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH)
endif
-if CREATE_GJDOC
-USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):generated:. $(JAVAC_FLAGS)
-else
-USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):. $(JAVAC_FLAGS)
-endif
-
if CREATE_WRAPPERS
bin_SCRIPTS =
bin_PROGRAMS = gappletviewer gjarsigner gkeytool \
@@ -329,7 +327,7 @@ endif
$(srcdir)/sun/rmi/rmic \
$(GJDOC_EX) \
-name '*.java' -print > classes.lst
- $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d classes @classes.lst
+ $(JCOMPILER) -g -d classes @classes.lst
cat classes.lst asm.lst > all-classes.lst
## Copy over tools resource files.
@list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \