[kaffe] CVS kaffe (guilhem): Fix for darwin: link jitBasic with libreplace.
Kaffe CVS
cvs-commits at kaffe.org
Thu Jan 6 08:31:26 PST 2005
PatchSet 5788
Date: 2005/01/06 16:25:30
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fix for darwin: link jitBasic with libreplace.
Members:
ChangeLog:1.3332->1.3333
test/internal/Makefile.am:1.14->1.15
test/internal/Makefile.in:1.90->1.91
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3332 kaffe/ChangeLog:1.3333
--- kaffe/ChangeLog:1.3332 Thu Jan 6 16:18:56 2005
+++ kaffe/ChangeLog Thu Jan 6 16:25:30 2005
@@ -1,3 +1,11 @@
+2005-01-06 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * tests/internal/Makefile.am: Link jitBasic with libreplace.la
+
+ * tests/internal/Makefile.in: Regenerated.
+
+ Reported by Michael Franz <mvfranz at gmail.com>
+
2005-01-06 Dalibor Topic <robilad at kaffe.org>
* TODO: Added task for extensions override mechanism.
Index: kaffe/test/internal/Makefile.am
diff -u kaffe/test/internal/Makefile.am:1.14 kaffe/test/internal/Makefile.am:1.15
--- kaffe/test/internal/Makefile.am:1.14 Sat Jan 1 19:57:50 2005
+++ kaffe/test/internal/Makefile.am Thu Jan 6 16:25:32 2005
@@ -45,10 +45,11 @@
-I$(top_srcdir)/kaffe/kaffevm/jni
LIBNATIVE = $(top_builddir)/libraries/clib/native/libnative.la
+LIBREPLACE = $(top_builddir)/replace/libreplace.la
LIBKAFFEVM = ../../kaffe/kaffevm/libkaffevm.la $(libjvmpi)
jitBasic_LDFLAGS = -export-dynamic
-jitBasic_LDADD = "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) $(libxprof) @LIBLTDL@
+jitBasic_LDADD = "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) $(LIBREPLACE) $(libxprof) @LIBLTDL@
jitBasic_DEPENDENCIES = $(LIBNATIVE) $(LIBKAFFEVM) $(libxprof)
STUB = main_stub.c
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.90 kaffe/test/internal/Makefile.in:1.91
--- kaffe/test/internal/Makefile.in:1.90 Sat Jan 1 19:57:50 2005
+++ kaffe/test/internal/Makefile.in Thu Jan 6 16:25:32 2005
@@ -93,7 +93,8 @@
@ENABLE_JVMPI_TRUE@ ../../kaffe/jvmpi/libkaffejvmpi.la
am__DEPENDENCIES_3 = ../../kaffe/kaffevm/libkaffevm.la \
$(am__DEPENDENCIES_2)
- at NEED_LIBXPROF_TRUE@am__DEPENDENCIES_4 = \
+am__DEPENDENCIES_4 = $(top_builddir)/replace/libreplace.la
+ at NEED_LIBXPROF_TRUE@am__DEPENDENCIES_5 = \
@NEED_LIBXPROF_TRUE@ ../../kaffe/xprof/libkaffexprof.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
@@ -399,9 +400,10 @@
-I$(top_srcdir)/kaffe/kaffevm/jni
LIBNATIVE = $(top_builddir)/libraries/clib/native/libnative.la
+LIBREPLACE = $(top_builddir)/replace/libreplace.la
LIBKAFFEVM = ../../kaffe/kaffevm/libkaffevm.la $(libjvmpi)
jitBasic_LDFLAGS = -export-dynamic
-jitBasic_LDADD = "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) $(libxprof) @LIBLTDL@
+jitBasic_LDADD = "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) $(LIBREPLACE) $(libxprof) @LIBLTDL@
jitBasic_DEPENDENCIES = $(LIBNATIVE) $(LIBKAFFEVM) $(libxprof)
STUB = main_stub.c
JIT_STUB = jit_stub.c
More information about the kaffe
mailing list