diff options
| author | Mark Wielaard <mark@klomp.org> | 2008-06-13 00:31:38 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2008-06-13 00:31:38 +0000 |
| commit | 729e1e497a1cb68477209bba3cd30d67c2837b4c (patch) | |
| tree | 7990bb6941f7d9196351452e5bb42bd8546b3b06 /tools | |
| parent | fc856fe8ceadfad5a72892c6519640998578a76d (diff) | |
| download | classpath-729e1e497a1cb68477209bba3cd30d67c2837b4c.tar.gz | |
* tools/Makefile.am (USE_JAVAC_FLAGS): Use relative generated dir.
(TOOLS_ZIP): Generate antlr output in relative dir.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 782a3d218..b5eec9691 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,7 +6,7 @@ GLIBJ_CLASSPATH=asm # Setup the compiler to use the GNU Classpath library we just built. JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) -USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):$(builddir)/generated:. $(JAVAC_FLAGS) +USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):generated:. $(JAVAC_FLAGS) if CREATE_WRAPPERS bin_SCRIPTS = @@ -286,7 +286,7 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) @rm -rf classes asm generated mkdir -p classes asm generated/gnu/classpath/tools/gjdoc/expr ## Generate antlr sources. - $(ANTLR) -o $(builddir)/generated/gnu/classpath/tools/gjdoc/expr \ + $(ANTLR) -o generated/gnu/classpath/tools/gjdoc/expr \ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g ## Compile ASM separately as it is latin-1 encoded. find $(srcdir)/external/asm -name '*.java' -print > asm.lst |