[kaffe] CVS kaffe (guilhem): Fixlet about JNI tests.

[Kaffe CVS]

PatchSet 5670 
Date: 2005/04/10 17:26:28
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fixlet about JNI tests.

        * test/jni/Makefile.am: Fixed dlopened libraries.

        * test/jni/Makefile.in: Regenerated.

Members: 
	ChangeLog:1.3836->1.3837 
	test/jni/Makefile.am:1.6->1.7 
	test/jni/Makefile.in:1.34->1.35 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3836 kaffe/ChangeLog:1.3837
--- kaffe/ChangeLog:1.3836	Sun Apr 10 16:46:02 2005
+++ kaffe/ChangeLog	Sun Apr 10 17:26:28 2005
@@ -1,5 +1,11 @@
 2005-04-10  Guilhem Lavaux  <guilhem at kaffe.org>
 
+	* test/jni/Makefile.am: Fixed dlopened libraries.
+
+	* test/jni/Makefile.in: Regenerated.
+
+2005-04-10  Guilhem Lavaux  <guilhem at kaffe.org>
+
 	* configure.ac: Reset to 1.1.x-cvs
 	
 	* configure: Regenerated.
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.6 kaffe/test/jni/Makefile.am:1.7
--- kaffe/test/jni/Makefile.am:1.6	Sun Jan 30 15:17:39 2005
+++ kaffe/test/jni/Makefile.am	Sun Apr 10 17:26:31 2005
@@ -32,7 +32,7 @@
 
 jniBase_SOURCES= jniBase.c
 jniBase_LDADD= \
-	"-dlopen" $(LIBNATIVE) \
+	$(DLOPEN_JAVA_LIBS) \
 	$(LIBKAFFEVM) \
 	$(LIBREPLACE) \
         $(LTLIBINTL) \
@@ -41,7 +41,7 @@
 
 jniExecClass_SOURCES= jniExecClass.c
 jniExecClass_LDADD= \
-	"-dlopen" $(LIBNATIVE) \
+	$(DLOPEN_JAVA_LIBS) \
 	$(LIBKAFFEVM) \
 	$(LIBREPLACE) \
         $(LTLIBINTL) \
@@ -50,7 +50,7 @@
 
 jniReflect_SOURCES= jniReflect.c
 jniReflect_LDADD= \
-	"-dlopen" $(LIBNATIVE) \
+	$(DLOPEN_JAVA_LIBS) \
 	$(LIBKAFFEVM) \
 	$(LIBREPLACE) \
         $(LTLIBINTL) \
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.34 kaffe/test/jni/Makefile.in:1.35
--- kaffe/test/jni/Makefile.in:1.34	Thu Mar 31 11:55:55 2005
+++ kaffe/test/jni/Makefile.in	Sun Apr 10 17:26:31 2005
@@ -78,8 +78,7 @@
 CONFIG_CLEAN_FILES =
 am_jniBase_OBJECTS = jniBase.$(OBJEXT)
 jniBase_OBJECTS = $(am_jniBase_OBJECTS)
-am__DEPENDENCIES_1 =  \
-	$(top_builddir)/libraries/clib/native/libnative.la
+am__DEPENDENCIES_1 =
 @ENABLE_JVMPI_TRUE at am__DEPENDENCIES_2 =  \
 @ENABLE_JVMPI_TRUE@	../../kaffe/jvmpi/libkaffejvmpi.la
 @NEED_LIBXPROF_TRUE at am__DEPENDENCIES_3 =  \
@@ -87,7 +86,6 @@
 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)
@@ -400,7 +398,7 @@
 LIBKAFFEVM = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(libjvmpi) $(libxprof)
 jniBase_SOURCES = jniBase.c
 jniBase_LDADD = \
-	"-dlopen" $(LIBNATIVE) \
+	$(DLOPEN_JAVA_LIBS) \
 	$(LIBKAFFEVM) \
 	$(LIBREPLACE) \
         $(LTLIBINTL) \
@@ -409,7 +407,7 @@
 jniBase_DEPENDENCIES = $(LIBKAFFEVM)
 jniExecClass_SOURCES = jniExecClass.c
 jniExecClass_LDADD = \
-	"-dlopen" $(LIBNATIVE) \
+	$(DLOPEN_JAVA_LIBS) \
 	$(LIBKAFFEVM) \
 	$(LIBREPLACE) \
         $(LTLIBINTL) \
@@ -418,7 +416,7 @@
 jniExecClass_DEPENDENCIES = $(LIBKAFFEVM)
 jniReflect_SOURCES = jniReflect.c
 jniReflect_LDADD = \
-	"-dlopen" $(LIBNATIVE) \
+	$(DLOPEN_JAVA_LIBS) \
 	$(LIBKAFFEVM) \
 	$(LIBREPLACE) \
         $(LTLIBINTL) \