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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/Makefile.am | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index a3cf1b75a..56b3c4577 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,24 +1,7 @@ ## Input file for automake to generate the Makefile.in used by configure GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip' -# Setup the compiler to use the GNU Classpath library we just build -#if FOUND_GCJ -#JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C -#else -#if FOUND_JIKES -#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:. -#else -if FOUND_ECJ -JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip' -else -if FOUND_JAVAC -JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip' -else -JCOMPILER = echo "No compiler found" 1>&2; exit 1 -#endif -#endif -endif -endif +JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip' # All our example java source files EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java |