summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDalibor Topic <robilad@yahoo.com>2006-04-02 20:55:33 +0000
committerDalibor Topic <robilad@yahoo.com>2006-04-02 20:55:33 +0000
commit2e50680946b3e82b86c2db8b5efbc9e651407d55 (patch)
tree101ea980c3d3d1b7bb42bd0cce5e85bdec67bca3 /examples
parent9cdead1bd74a26f78c1e2d7650fafc80afc7b2f5 (diff)
downloadclasspath-2e50680946b3e82b86c2db8b5efbc9e651407d55.tar.gz
Added support for using a prebuilt glibj.zip
2006-04-02 Dalibor Topic <robilad@kaffe.org> * configure.ac (with-glibj-zip): Added new option. * examples/Makefile.am, lib/Makefile.am, tools/Makefile.am: Adapted build classpath to use glibj.zip, in addition to classes in lib directory.
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile.am9
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1b16c586b..71909e8d6 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,17 +1,18 @@
## Input file for automake to generate the Makefile.in used by configure
+GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip'
# Setup the compiler to use the GNU Classpath library we just build
if FOUND_GCJ
-JCOMPILER = $(GCJ) -encoding UTF-8 --bootclasspath '$(top_builddir)/lib' --classpath . -C
+JCOMPILER = $(GCJ) -encoding UTF-8 --bootclasspath $(GLIBJ_CLASSPATH) --classpath . -C
else
if FOUND_JIKES
-JCOMPILER = $(JIKES) $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
+JCOMPILER = $(JIKES) $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(GLIBJ_CLASSPATH):.
else
if FOUND_GCJX
-JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:.
+JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath '' -sourcepath '' -classpath $(GLIBJ_CLASSPATH):.
else
if FOUND_ECJ
-JCOMPILER = $(ECJ) -encoding UTF-8 -bootclasspath '$(top_builddir)/lib' -classpath .
+JCOMPILER = $(ECJ) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
else
error dunno how to setup the JCOMPILER and compile
endif