diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-12 22:30:18 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-12 22:30:18 +0000 |
| commit | c16bf0bb4b41362a6f0a35fb1d61744f1487bfcb (patch) | |
| tree | 188e06a0aa1bff0a13e6de0323300a699a78496c /lib | |
| parent | d6eb5ba5f739900a8947990e17fd9de439e70711 (diff) | |
| download | classpath-c16bf0bb4b41362a6f0a35fb1d61744f1487bfcb.tar.gz | |
2008-02-11 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/34578:
* NEWS: Mention javah and javac build changes.
* configure.ac: Call AC_PROG_JAVAC and
CLASSPATH_JAVAC_MEM_CHECK instead of CLASSPATH_FIND_JAVAC.
* examples/Makefile.am: Simplify compiler choice
to just use JAVAC.
* lib/Makefile.am: Likewise, but with JAVAC_MEM_OPT too.
* m4/ac_prog_javac.m4: New file.
* m4/ac_prog_javac_works.m4: Likewise.
* m4/acinclude.m4:
(CLASSPATH_FIND_JAVAC): Removed.
(CLASSPATH_WITH_GCJ): Removed.
(CLASSPATH_CHECK_GCJ): Removed.
(CLASSPATH_WITH_JIKES): Removed.
(CLASSPATH_CHECK_JIKES): Removed.
(CLASSPATH_WITH_KJC): Removed.
(CLASSPATH_CHECK_KJC): Removed.
(CLASSPATH_WITH_ECJ): Removed.
(CLASSPATH_CHECK_ECJ): Removed.
(CLASSPATH_WITH_JAVAC): Removed.
(CLASSPATH_CHECK_JAVAC): Removed.
(CLASSPATH_JAVAC_MEM_CHECK): Added.
* tools/Makefile.am: Simplify compiler choice
to just javac.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 71cbe9ef9..429caf005 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,31 +8,7 @@ sinclude $(JAVA_DEPEND) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER) # handling source to bytecode compiler programs like gcj, jikes and kjc -if FOUND_ECJ -JCOMPILER = $(ECJ) -1.5 -warn:-deprecation,serial,typeHiding,unchecked,unused -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes -else -if FOUND_JAVAC -JCOMPILER = $(JAVAC) $(JAVAC_OPTS) -bootclasspath '' -classpath $(compile_classpath) -d . @classes -#else -#if FOUND_GCJ -## This should never be used when gcj is the compiler. -## See the compile-classes target. -#JCOMPILER = exit 1 -#else -#if FOUND_JIKES -#JCOMPILER = $(JIKES) $(JIKESWARNINGS) +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes -#else -#if FOUND_KJC -### FIXME: from what I can tell, kjc does not support a -encoding option. -#JCOMPILER = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes -else -JCOMPILER = echo "No compiler found" 1>&2; exit 1 -#endif -#endif # FOUND_KJC -#endif # FOUND_GCJ -#endif # FOUND_JIKES -endif # FOUND_JAVAC -endif # FOUND_ECJ +JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes if CREATE_COLLECTIONS COLLECTIONS = collections.jar |