[kaffe] CVS kaffe (robilad): Added missing libraries to jni test linker flags

Kaffe CVS cvs-commits at kaffe.org
Thu Jan 6 14:14:51 PST 2005


PatchSet 5799 
Date: 2005/01/06 20:04:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Added missing libraries to jni test linker flags

Members: 
	ChangeLog:1.3343->1.3344 
	test/jni/Makefile.am:1.3->1.4 
	test/jni/Makefile.in:1.22->1.23 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3343 kaffe/ChangeLog:1.3344
--- kaffe/ChangeLog:1.3343	Thu Jan  6 19:37:17 2005
+++ kaffe/ChangeLog	Thu Jan  6 20:04:46 2005
@@ -1,3 +1,10 @@
+2005-01-06  Dalibor Topic  <topic at mpiat2305>
+
+	* test/jni/Makefile.am (jniBase_LDADD): Link jitBasic with 
+	libreplace.la and LTLIBINTL.
+
+	* tests/internal/Makefile.in: Regenerated.
+
 2005-01-06  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.3 kaffe/test/jni/Makefile.am:1.4
--- kaffe/test/jni/Makefile.am:1.3	Mon Sep 20 17:06:17 2004
+++ kaffe/test/jni/Makefile.am	Thu Jan  6 20:04:50 2005
@@ -27,10 +27,16 @@
 endif
 
 LIBNATIVE = $(top_builddir)/libraries/clib/native/libnative.la
+LIBREPLACE = $(top_builddir)/replace/libreplace.la
 LIBKAFFEVM = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(libjvmpi) $(libxprof)
 
 jniBase_SOURCES= jniBase.c
-jniBase_LDADD= "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) @LIBLTDL@
+jniBase_LDADD= \
+	"-dlopen" $(LIBNATIVE) \
+	$(LIBKAFFEVM) \
+	$(LIBREPLACE) \
+        $(LTLIBINTL) \
+	@LIBLTDL@
 jniBase_DEPENDENCIES= $(LIBKAFFEVM)
 
 jniExecClass_SOURCES= jniExecClass.c
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.22 kaffe/test/jni/Makefile.in:1.23
--- kaffe/test/jni/Makefile.in:1.22	Wed Dec 22 19:05:35 2004
+++ kaffe/test/jni/Makefile.in	Thu Jan  6 20:04:50 2005
@@ -89,6 +89,8 @@
 @NEED_LIBXPROF_TRUE@	../../kaffe/xprof/libkaffexprof.la
 am__DEPENDENCIES_4 = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
+am__DEPENDENCIES_5 = $(top_builddir)/replace/libreplace.la
+am__DEPENDENCIES_6 =
 am_jniExecClass_OBJECTS = jniExecClass.$(OBJEXT)
 jniExecClass_OBJECTS = $(am_jniExecClass_OBJECTS)
 am_jniReflect_OBJECTS = jniReflect.$(OBJEXT)
@@ -392,9 +394,16 @@
 @ENABLE_JVMPI_FALSE at libjvmpi = #
 @ENABLE_JVMPI_TRUE at libjvmpi = ../../kaffe/jvmpi/libkaffejvmpi.la
 LIBNATIVE = $(top_builddir)/libraries/clib/native/libnative.la
+LIBREPLACE = $(top_builddir)/replace/libreplace.la
 LIBKAFFEVM = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(libjvmpi) $(libxprof)
 jniBase_SOURCES = jniBase.c
-jniBase_LDADD = "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) @LIBLTDL@
+jniBase_LDADD = \
+	"-dlopen" $(LIBNATIVE) \
+	$(LIBKAFFEVM) \
+	$(LIBREPLACE) \
+        $(LTLIBINTL) \
+	@LIBLTDL@
+
 jniBase_DEPENDENCIES = $(LIBKAFFEVM)
 jniExecClass_SOURCES = jniExecClass.c
 jniExecClass_LDADD = "-dlopen" $(LIBNATIVE) $(LIBKAFFEVM) @LIBLTDL@




More information about the kaffe mailing list