diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
| commit | da66af5951b18b6f5e8752cbbe11f5f842332a33 (patch) | |
| tree | a28e126d1415e3689be6c7b2c2d061ae51194195 /tools | |
| parent | ab90923ee693a17e2e0e37b6ba5a84794c9236de (diff) | |
| download | classpath-da66af5951b18b6f5e8752cbbe11f5f842332a33.tar.gz | |
2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of generics-branch to HEAD (woohoo!)
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 1d57f9ba7..8f8ae96fe 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,23 +4,15 @@ GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' GLIBJ_CLASSPATH=asm # Setup the compiler to use the GNU Classpath library we just build -if FOUND_GCJ -JCOMPILER = $(GCJ) -encoding UTF-8 --bootclasspath $(GLIBJ_BOOTCLASSPATH) --classpath $(GLIBJ_CLASSPATH):. -C -else -if FOUND_JIKES -JCOMPILER = $(JIKES) $(JIKESENCODING) -bootclasspath '$(GLIBJ_BOOTCLASSPATH)' -extdirs '' -sourcepath '' --classpath $(GLIBJ_CLASSPATH):. -else if FOUND_GCJX JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -sourcepath '' -classpath $(GLIBJ_CLASSPATH):. else if FOUND_ECJ -JCOMPILER = $(ECJ) -source 1.4 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) +JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) else error dunno how to setup the JCOMPILER and compile endif endif -endif -endif if CREATE_WRAPPERS bin_SCRIPTS = @@ -28,6 +20,7 @@ bin_PROGRAMS = gappletviewer gjarsigner gkeytool \ gjar gnative2ascii gserialver gjavah grmiregistry \ gtnameserv gorbd grmid grmic + AM_CPPFLAGS = -Wall \ -I$(top_srcdir)/include \ -DLIBJVM="\"$(libdir)/libjvm\"" \ |