[kaffe] CVS kaffe (robilad): fix for --with-staticlib
Kaffe CVS
cvs-commits at kaffe.org
Sun Jul 1 19:59:26 PDT 2007
PatchSet 7496
Date: 2007/07/02 02:58:27
Author: robilad
Branch: HEAD
Tag: (none)
Log:
fix for --with-staticlib
2007-07-02 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffe/Makefile.am (kaffe_bin_LDADD),
test/internal/Makefile.am (jitBasic_LDADD),
test/jni/Makefile.am (jniBase_LDADD, jniExecClass_LDADD,
jniReflect_LDADD, jniWeakTest_LDADD) dlopen libkaffevm.
* test/internal/Makefile.am (LIBNATIVE) Removed.
Members:
ChangeLog:1.4995->1.4996
kaffe/kaffe/Makefile.am:1.38->1.39
kaffe/kaffe/Makefile.in:1.212->1.213
test/internal/Makefile.am:1.34->1.35
test/internal/Makefile.in:1.156->1.157
test/jni/Makefile.am:1.18->1.19
test/jni/Makefile.in:1.86->1.87
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4995 kaffe/ChangeLog:1.4996
--- kaffe/ChangeLog:1.4995 Sun Jul 1 19:09:13 2007
+++ kaffe/ChangeLog Mon Jul 2 02:58:27 2007
@@ -1,3 +1,12 @@
+2007-07-02 Dalibor Topic <robilad at kaffe.org>
+
+ * kaffe/kaffe/Makefile.am (kaffe_bin_LDADD),
+ test/internal/Makefile.am (jitBasic_LDADD),
+ test/jni/Makefile.am (jniBase_LDADD, jniExecClass_LDADD,
+ jniReflect_LDADD, jniWeakTest_LDADD) dlopen libkaffevm.
+
+ * test/internal/Makefile.am (LIBNATIVE) Removed.
+
2007-07-01 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/Makefile.am (native_LTLIBRARIES) Added libkaffe.la
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.38 kaffe/kaffe/kaffe/Makefile.am:1.39
--- kaffe/kaffe/kaffe/Makefile.am:1.38 Sun Jul 1 19:09:13 2007
+++ kaffe/kaffe/kaffe/Makefile.am Mon Jul 2 02:58:28 2007
@@ -69,7 +69,8 @@
$(LIBKAFFEVM) \
$(KAFFE_LIBS) \
$(top_builddir)/replace/libreplace.la \
- $(LTLIBINTL)
+ $(LTLIBINTL) \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
kaffe_bin_DEPENDENCIES = \
$(LIBKAFFEVM) \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.212 kaffe/kaffe/kaffe/Makefile.in:1.213
--- kaffe/kaffe/kaffe/Makefile.in:1.212 Sun Jul 1 19:09:13 2007
+++ kaffe/kaffe/kaffe/Makefile.in Mon Jul 2 02:58:28 2007
@@ -348,7 +348,8 @@
$(LIBKAFFEVM) \
$(KAFFE_LIBS) \
$(top_builddir)/replace/libreplace.la \
- $(LTLIBINTL)
+ $(LTLIBINTL) \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
kaffe_bin_DEPENDENCIES = \
$(LIBKAFFEVM) \
Index: kaffe/test/internal/Makefile.am
diff -u kaffe/test/internal/Makefile.am:1.34 kaffe/test/internal/Makefile.am:1.35
--- kaffe/test/internal/Makefile.am:1.34 Sun Jul 1 19:09:14 2007
+++ kaffe/test/internal/Makefile.am Mon Jul 2 02:58:28 2007
@@ -41,25 +41,20 @@
-I$(top_srcdir)/kaffe/kaffevm/jni \
-I$(top_srcdir)/config/$(Khost_cpu) \
-I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os)
-if USE_SYSTEM_CLASSPATH
-LIBNATIVE = $(CLASSPATH_LIBDIR)/classpath/libjavalang.la
-else
-LIBNATIVE = $(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/libjavalang.la
-endif
LIBREPLACE = $(top_builddir)/replace/libreplace.la
LIBKAFFEVM = ../../kaffe/kaffevm/libkaffe.la $(libjvmpi)
jitBasic_LDFLAGS = -export-dynamic
jitBasic_LDADD = \
- "-dlopen" $(LIBNATIVE) \
- $(LIBKAFFEVM) \
+ @LIBLTDL@ \
+ $(LTLIBINTL) \
$(LIBREPLACE) \
+ $(LIBKAFFEVM) \
$(libxprof) \
- $(LTLIBINTL) \
- @LIBLTDL@
+ -dlopen ../../kaffe/kaffevm/libkaffevm.la
-jitBasic_DEPENDENCIES = $(LIBNATIVE) $(LIBKAFFEVM) $(libxprof)
+jitBasic_DEPENDENCIES = $(LIBKAFFEVM) $(libxprof)
STUB = main_stub.c
JIT_STUB = jit_stub.c
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.156 kaffe/test/internal/Makefile.in:1.157
--- kaffe/test/internal/Makefile.in:1.156 Sun Jul 1 19:09:14 2007
+++ kaffe/test/internal/Makefile.in Mon Jul 2 02:58:28 2007
@@ -77,13 +77,13 @@
am_jitBasic_OBJECTS = jitBasic.$(OBJEXT) stringParsing.$(OBJEXT) \
$(am__objects_1)
jitBasic_OBJECTS = $(am_jitBasic_OBJECTS)
- at ENABLE_JVMPI_TRUE@am__DEPENDENCIES_1 = \
+am__DEPENDENCIES_1 =
+ at ENABLE_JVMPI_TRUE@am__DEPENDENCIES_2 = \
@ENABLE_JVMPI_TRUE@ ../../kaffe/jvmpi/libkaffejvmpi.la
-am__DEPENDENCIES_2 = ../../kaffe/kaffevm/libkaffe.la \
- $(am__DEPENDENCIES_1)
- at NEED_LIBXPROF_TRUE@am__DEPENDENCIES_3 = \
+am__DEPENDENCIES_3 = ../../kaffe/kaffevm/libkaffe.la \
+ $(am__DEPENDENCIES_2)
+ at NEED_LIBXPROF_TRUE@am__DEPENDENCIES_4 = \
@NEED_LIBXPROF_TRUE@ ../../kaffe/xprof/libkaffexprof.la
-am__DEPENDENCIES_4 =
jitBasic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(jitBasic_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -334,20 +334,18 @@
-I$(top_srcdir)/config/$(Khost_cpu) \
-I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os)
- at USE_SYSTEM_CLASSPATH_FALSE@LIBNATIVE = $(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/libjavalang.la
- at USE_SYSTEM_CLASSPATH_TRUE@LIBNATIVE = $(CLASSPATH_LIBDIR)/classpath/libjavalang.la
LIBREPLACE = $(top_builddir)/replace/libreplace.la
LIBKAFFEVM = ../../kaffe/kaffevm/libkaffe.la $(libjvmpi)
jitBasic_LDFLAGS = -export-dynamic
jitBasic_LDADD = \
- "-dlopen" $(LIBNATIVE) \
- $(LIBKAFFEVM) \
+ @LIBLTDL@ \
+ $(LTLIBINTL) \
$(LIBREPLACE) \
+ $(LIBKAFFEVM) \
$(libxprof) \
- $(LTLIBINTL) \
- @LIBLTDL@
+ -dlopen ../../kaffe/kaffevm/libkaffevm.la
-jitBasic_DEPENDENCIES = $(LIBNATIVE) $(LIBKAFFEVM) $(libxprof)
+jitBasic_DEPENDENCIES = $(LIBKAFFEVM) $(libxprof)
STUB = main_stub.c
JIT_STUB = jit_stub.c
jitBasic_SOURCES = \
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.18 kaffe/test/jni/Makefile.am:1.19
--- kaffe/test/jni/Makefile.am:1.18 Sun Jul 1 19:09:14 2007
+++ kaffe/test/jni/Makefile.am Mon Jul 2 02:58:28 2007
@@ -43,7 +43,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniBase_DEPENDENCIES= $(LIBKAFFEVM)
jniExecClass_SOURCES= jniExecClass.c
@@ -53,7 +54,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniExecClass_DEPENDENCIES= \
$(LIBKAFFEVM) \
HelloWorldApp.class
@@ -65,7 +67,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniReflect_DEPENDENCIES= \
$(LIBKAFFEVM) \
HelloWorldApp.class
@@ -117,7 +120,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniWeakTest_DEPENDENCIES = $(LIBKAFFEVM) libjniweaklib.la
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.86 kaffe/test/jni/Makefile.in:1.87
--- kaffe/test/jni/Makefile.in:1.86 Sun Jul 1 19:09:14 2007
+++ kaffe/test/jni/Makefile.in Mon Jul 2 02:58:28 2007
@@ -357,7 +357,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniBase_DEPENDENCIES = $(LIBKAFFEVM)
jniExecClass_SOURCES = jniExecClass.c
@@ -367,7 +368,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniExecClass_DEPENDENCIES = \
$(LIBKAFFEVM) \
@@ -380,7 +382,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniReflect_DEPENDENCIES = \
$(LIBKAFFEVM) \
@@ -427,7 +430,8 @@
$(LIBKAFFEVM) \
$(LIBREPLACE) \
$(LTLIBINTL) \
- @LIBLTDL@
+ @LIBLTDL@ \
+ -dlopen $(top_builddir)/kaffe/kaffevm/libkaffevm.la
jniWeakTest_DEPENDENCIES = $(LIBKAFFEVM) libjniweaklib.la
EXTRA_DIST = \
More information about the kaffe
mailing list