diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-05-29 19:49:25 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-05-29 19:49:25 +0000 |
| commit | e5d0bd983b2614262791b821f60d21562a8e203f (patch) | |
| tree | 41b4265357d9dbbd6b226afacf6281f8b2af7269 /tools | |
| parent | a286cb941e4d914872e72f8e4e9e8f3b161f9ad0 (diff) | |
| download | classpath-e5d0bd983b2614262791b821f60d21562a8e203f.tar.gz | |
2006-05-29 Thomas Fitzsimmons <fitzsim@redhat.com>
* tools/Makefile.am [FOUND_CACAO] (LIBJVM): Define to -ljvm.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index ba5ed755e..201939832 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -29,7 +29,7 @@ if FOUND_GCJ LIBJVM = -lgcj else if FOUND_CACAO -LIBJVM = -lcacaovm +LIBJVM = -ljvm else LIBJVM = endif @@ -40,21 +40,21 @@ appletviewer_CFLAGS = -Wall \ -DDATA_DIR="\"$(datadir)\"" \ -DPACKAGE="\"$(PACKAGE)\"" \ -DTOOLNAME="\"appletviewer\"" -appletviewer_LDFLAGS = $(LIBJVM) +appletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) jarsigner_SOURCES = toolwrapper.c jarsigner_CFLAGS = -Wall \ -DDATA_DIR="\"$(datadir)\"" \ -DPACKAGE="\"$(PACKAGE)\"" \ -DTOOLNAME="\"jarsigner\"" -jarsigner_LDFLAGS = $(LIBJVM) +jarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) keytool_SOURCES = toolwrapper.c keytool_CFLAGS = -Wall \ -DDATA_DIR="\"$(datadir)\"" \ -DPACKAGE="\"$(PACKAGE)\"" \ -DTOOLNAME="\"keytool\"" -keytool_LDFLAGS = $(LIBJVM) +keytool_LDFLAGS = -L$(libdir) $(LIBJVM) else bin_SCRIPTS = appletviewer jarsigner keytool |