[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Merged in new DirectByteBufferImpl code and better

Kaffe CVS cvs-commits at kaffe.org
Wed Dec 1 00:26:14 PST 2004


PatchSet 5500 
Date: 2004/12/01 02:41:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Merged in new DirectByteBufferImpl code and better support for classpath's JNI code

2004-11-29  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac:
        Moved classpath library up to clib.

        * include/Makefile.am:
        Adapted for java_nio_VMDirectByteBuffer.java.

        * include/kaffe/jni_md.h.in,
        kaffe/kaffeh/support.c,
        kaffe/kaffevm/classMethod.h,
        kaffe/kaffevm/constants.c,
        kaffe/kaffevm/gtypes.h,
        kaffe/xprof/memorySamples.c:
        Replaced SIZE_OF_VOIDP with SIZEOF_VOID_P.

        * libraries/clib/Makefile.am:
        Added classpath subdir.

        * libraries/clib/awt/classpath-gtk/Makefile.am:
        Removed classpath subdir.

        * libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:
        Link to classpath library.

        * libraries/clib/classpath/.cvsignore,
        libraries/clib/classpath/Makefile.am,
        libraries/clib/classpath/Makefile.in,
        libraries/clib/classpath/jcl.c,
        libraries/clib/classpath/jcl.h,
        libraries/clib/classpath/jnilink.c,
        libraries/clib/classpath/jnilink.h,
        libraries/clib/classpath/native_state.c,
        libraries/clib/classpath/native_state.h,
        libraries/clib/classpath/primlib.c,
        libraries/clib/classpath/primlib.h:
        Moved over from libraries/clib/awt/classpath-gtk.

        * libraries/clib/nio/Makefile.am:
        Added java_nio_VMDirectByteBuffer.c.

        * configure,
        config/config.h.in,
        include/Makefile.in,
        libraries/clib/Makefile.in,
        libraries/clib/awt/classpath-gtk/Makefile.in,
        libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
        libraries/clib/nio/Makefile.in,
        libraries/javalib/Klasses.jar.bootstrap,
        libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in,
        libraries/javalib/all.files,
        libraries/javalib/bootstrap.classlist:
        Regenerated.

        * libraries/clib/nio/java_nio_VMDirectByteBuffer.c,
        libraries/javalib/gnu/classpath/RawData.java,
        libraries/javalib/gnu/classpath/RawData32.java,
        libraries/javalib/gnu/classpath/RawData64.java,
        libraries/javalib/java/nio/DirectByteBufferImpl.java,
        libraries/javalib/java/nio/MappedByteBufferImpl.java,
        libraries/javalib/java/nio/VMDirectByteBuffer.java:
        Resynced with GNU Classpath.

        2004-11-21  Jeroen Frijters  <jeroen at frijters.net>

        * java/nio/DirectByteBufferImpl.java
        (ReadOnly): New inner subclass.
        (ReadWrite): New inner subclass.
        (owner): Made final and private.
        (address): Made final.
        (DirectByteBufferImpl(int)): New constructor.
        (DirectByteBufferImpl(Object,RawData,int,int,int)): New constructor.
        (DirectByteBufferImpl(Object,RawData,int,int,int,boolean)): Removed.
        (allocate): Modified to instantiate ReadWrite subclass.
        (finalize): Fixed to only free the buffer, if we own it.
        (put): Removed read-only check.
        (slice, duplicate): Modified to instantiate appropriate subclass.
        (isReadOnly): Removed.
        * java/nio/MappedByteBufferImpl.java
        (slice, duplicate): Modified to instantiate appropriate
        DirectByteBufferImpl subclass.

        2004-11-21  Michael Koch  <konqueror at gmx.de>

        * gnu/classpath/RawData.java: Made abstract.
        * gnu/classpath/RawData32.java,
        gnu/classpath/RawData64.java: New files.
        * include/Makefile.am:
        Don't generate java_nio_DirectByteBufferImpl.h anymore
        and generate java_nio_VMDirectByteBuffer.h now.
        * java/nio/DirectByteBufferImpl.java:
        Moved native methods to VMDirectByteBuffer.
        * java/nio/MappedByteBufferImpl.java:
        Use methods from VMDirectBteBuffer.
        * native/jni/java-nio/Makefile.am:
        Removed java_nio_DirectByteBufferImpl.c
        and added java_nio_VMDirectByteBuffer.c
        * include/java_nio_DirectByteBufferImpl.h,
        native/jni/java-nio/java_nio_DirectByteBufferImpl.c:
        Removed.
        * include/java_nio_VMDirectByteBuffer.h,
        * native/jni/java-nio/java_nio_VMDirectByteBuffer.c,
        * vm/reference/java/nio/VMDirectByteBuffer.java:
        New files.

Members: 
	ChangeLog:1.3046->1.3047 
	configure:1.395->1.396 
	configure.ac:1.90->1.91 
	config/config.h.in:1.130->1.131 
	include/Makefile.am:1.76->1.77 
	include/Makefile.in:1.193->1.194 
	include/kaffe/jni_md.h.in:1.1->1.2 
	kaffe/kaffeh/support.c:1.45->1.46 
	kaffe/kaffevm/classMethod.h:1.68->1.69 
	kaffe/kaffevm/constants.c:1.19->1.20 
	kaffe/kaffevm/gtypes.h:1.13->1.14 
	kaffe/xprof/memorySamples.c:1.7->1.8 
	libraries/clib/Makefile.am:1.11->1.12 
	libraries/clib/Makefile.in:1.127->1.128 
	libraries/clib/awt/classpath-gtk/Makefile.am:1.1->1.2 
	libraries/clib/awt/classpath-gtk/Makefile.in:1.11->1.12 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.7->1.8 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.14->1.15 
	libraries/clib/classpath/.cvsignore:INITIAL->1.1 
	libraries/clib/classpath/Makefile.am:INITIAL->1.1 
	libraries/clib/classpath/Makefile.in:INITIAL->1.1 
	libraries/clib/classpath/jcl.c:INITIAL->1.1 
	libraries/clib/classpath/jcl.h:INITIAL->1.1 
	libraries/clib/classpath/jnilink.c:INITIAL->1.1 
	libraries/clib/classpath/jnilink.h:INITIAL->1.1 
	libraries/clib/classpath/native_state.c:INITIAL->1.1 
	libraries/clib/classpath/native_state.h:INITIAL->1.1 
	libraries/clib/classpath/primlib.c:INITIAL->1.1 
	libraries/clib/classpath/primlib.h:INITIAL->1.1 
	libraries/clib/nio/Makefile.am:1.7->1.8 
	libraries/clib/nio/Makefile.in:1.52->1.53 
	libraries/clib/nio/java_nio_VMDirectByteBuffer.c:INITIAL->1.1 
	libraries/javalib/Klasses.jar.bootstrap:1.72->1.73 
	libraries/javalib/Makefile.am:1.265->1.266 
	libraries/javalib/Makefile.in:1.346->1.347 
	libraries/javalib/all.files:1.52->1.53 
	libraries/javalib/bootstrap.classlist:1.61->1.62 
	libraries/javalib/gnu/classpath/RawData.java:1.1->1.2 
	libraries/javalib/gnu/classpath/RawData32.java:INITIAL->1.1 
	libraries/javalib/gnu/classpath/RawData64.java:INITIAL->1.1 
	libraries/javalib/java/nio/DirectByteBufferImpl.java:1.9->1.10 
	libraries/javalib/java/nio/MappedByteBufferImpl.java:1.8->1.9 
	libraries/javalib/java/nio/VMDirectByteBuffer.java:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3046 kaffe/ChangeLog:1.3047
--- kaffe/ChangeLog:1.3046	Mon Nov 29 15:38:37 2004
+++ kaffe/ChangeLog	Wed Dec  1 02:41:40 2004
@@ -1,5 +1,111 @@
 2004-11-29  Dalibor Topic  <robilad at kaffe.org>
 
+	* configure.ac:
+	Moved classpath library up to clib.
+
+	* include/Makefile.am:
+	Adapted for java_nio_VMDirectByteBuffer.java.
+
+	* include/kaffe/jni_md.h.in,
+	kaffe/kaffeh/support.c,
+	kaffe/kaffevm/classMethod.h,
+	kaffe/kaffevm/constants.c,
+	kaffe/kaffevm/gtypes.h,
+	kaffe/xprof/memorySamples.c:
+	Replaced SIZE_OF_VOIDP with SIZEOF_VOID_P.
+
+	* libraries/clib/Makefile.am:
+	Added classpath subdir.
+
+	* libraries/clib/awt/classpath-gtk/Makefile.am:
+	Removed classpath subdir.
+
+	* libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:
+	Link to classpath library.
+
+	* libraries/clib/classpath/.cvsignore,
+	libraries/clib/classpath/Makefile.am,
+	libraries/clib/classpath/Makefile.in,
+	libraries/clib/classpath/jcl.c,
+	libraries/clib/classpath/jcl.h,
+	libraries/clib/classpath/jnilink.c,
+	libraries/clib/classpath/jnilink.h,
+	libraries/clib/classpath/native_state.c,
+	libraries/clib/classpath/native_state.h,
+	libraries/clib/classpath/primlib.c,
+	libraries/clib/classpath/primlib.h:
+	Moved over from libraries/clib/awt/classpath-gtk.
+
+	* libraries/clib/nio/Makefile.am:
+	Added java_nio_VMDirectByteBuffer.c.
+
+	* configure,
+	config/config.h.in,
+	include/Makefile.in,
+	libraries/clib/Makefile.in,
+	libraries/clib/awt/classpath-gtk/Makefile.in,
+	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
+	libraries/clib/nio/Makefile.in,
+	libraries/javalib/Klasses.jar.bootstrap,
+	libraries/javalib/Makefile.am,
+	libraries/javalib/Makefile.in,
+	libraries/javalib/all.files,
+	libraries/javalib/bootstrap.classlist:
+	Regenerated.
+
+	* libraries/clib/nio/java_nio_VMDirectByteBuffer.c,
+	libraries/javalib/gnu/classpath/RawData.java,
+	libraries/javalib/gnu/classpath/RawData32.java,
+	libraries/javalib/gnu/classpath/RawData64.java,
+	libraries/javalib/java/nio/DirectByteBufferImpl.java,
+	libraries/javalib/java/nio/MappedByteBufferImpl.java,
+	libraries/javalib/java/nio/VMDirectByteBuffer.java:
+	Resynced with GNU Classpath.
+
+	2004-11-21  Jeroen Frijters  <jeroen at frijters.net>
+
+        * java/nio/DirectByteBufferImpl.java
+        (ReadOnly): New inner subclass.
+        (ReadWrite): New inner subclass.
+        (owner): Made final and private.
+        (address): Made final.
+        (DirectByteBufferImpl(int)): New constructor.
+        (DirectByteBufferImpl(Object,RawData,int,int,int)): New constructor.
+        (DirectByteBufferImpl(Object,RawData,int,int,int,boolean)): Removed.
+        (allocate): Modified to instantiate ReadWrite subclass.
+        (finalize): Fixed to only free the buffer, if we own it.
+        (put): Removed read-only check.
+        (slice, duplicate): Modified to instantiate appropriate subclass.
+        (isReadOnly): Removed.
+        * java/nio/MappedByteBufferImpl.java
+        (slice, duplicate): Modified to instantiate appropriate
+        DirectByteBufferImpl subclass.
+
+	2004-11-21  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/classpath/RawData.java: Made abstract.
+        * gnu/classpath/RawData32.java,
+        gnu/classpath/RawData64.java: New files.
+        * include/Makefile.am:
+        Don't generate java_nio_DirectByteBufferImpl.h anymore
+        and generate java_nio_VMDirectByteBuffer.h now.
+        * java/nio/DirectByteBufferImpl.java:
+        Moved native methods to VMDirectByteBuffer.
+        * java/nio/MappedByteBufferImpl.java:
+        Use methods from VMDirectBteBuffer.
+        * native/jni/java-nio/Makefile.am:
+        Removed java_nio_DirectByteBufferImpl.c
+        and added java_nio_VMDirectByteBuffer.c
+        * include/java_nio_DirectByteBufferImpl.h,
+        native/jni/java-nio/java_nio_DirectByteBufferImpl.c:
+        Removed.
+        * include/java_nio_VMDirectByteBuffer.h,
+        * native/jni/java-nio/java_nio_VMDirectByteBuffer.c,
+        * vm/reference/java/nio/VMDirectByteBuffer.java:
+        New files.
+
+2004-11-29  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/javax/swing/BorderFactory.java,
 	libraries/javalib/javax/swing/SwingUtilities.java:
         Resynced with GNU Classpath.
Index: kaffe/configure
diff -u kaffe/configure:1.395 kaffe/configure:1.396
--- kaffe/configure:1.395	Sun Nov 28 13:08:26 2004
+++ kaffe/configure	Wed Dec  1 02:41:43 2004
@@ -30477,9 +30477,9 @@
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for void*" >&5
-echo $ECHO_N "checking for void*... $ECHO_C" >&6
-if test "${ac_cv_type_voidp+set}" = set; then
+echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6
+if test "${ac_cv_type_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -30492,9 +30492,9 @@
 int
 main ()
 {
-if ((void* *) 0)
+if ((void * *) 0)
   return 0;
-if (sizeof (void*))
+if (sizeof (void *))
   return 0;
   ;
   return 0;
@@ -30522,24 +30522,24 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_voidp=yes
+  ac_cv_type_void_p=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_voidp=no
+ac_cv_type_void_p=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
-echo "${ECHO_T}$ac_cv_type_voidp" >&6
+echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6
 
-echo "$as_me:$LINENO: checking size of void*" >&5
-echo $ECHO_N "checking size of void*... $ECHO_C" >&6
-if test "${ac_cv_sizeof_voidp+set}" = set; then
+echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6
+if test "${ac_cv_sizeof_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_voidp" = yes; then
+  if test "$ac_cv_type_void_p" = yes; then
   # The cast to unsigned long works around a bug in the HP C Compiler
   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -30556,7 +30556,7 @@
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -30597,7 +30597,7 @@
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30654,7 +30654,7 @@
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void*))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
 test_array [0] = 0
 
   ;
@@ -30695,7 +30695,7 @@
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30760,7 +30760,7 @@
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30799,10 +30799,10 @@
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
-?*) ac_cv_sizeof_voidp=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
+?*) ac_cv_sizeof_void_p=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void*), 77
+echo "$as_me: error: cannot compute sizeof (void *), 77
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; } ;;
 esac
@@ -30821,8 +30821,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-long longval () { return (long) (sizeof (void*)); }
-unsigned long ulongval () { return (long) (sizeof (void*)); }
+long longval () { return (long) (sizeof (void *)); }
+unsigned long ulongval () { return (long) (sizeof (void *)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -30832,17 +30832,17 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     exit (1);
-  if (((long) (sizeof (void*))) < 0)
+  if (((long) (sizeof (void *))) < 0)
     {
       long i = longval ();
-      if (i != ((long) (sizeof (void*))))
+      if (i != ((long) (sizeof (void *))))
 	exit (1);
       fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (void*))))
+      if (i != ((long) (sizeof (void *))))
 	exit (1);
       fprintf (f, "%lu\n", i);
     }
@@ -30863,16 +30863,16 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_voidp=`cat conftest.val`
+  ac_cv_sizeof_void_p=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void*), 77
+echo "$as_me: error: cannot compute sizeof (void *), 77
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -30881,13 +30881,13 @@
 fi
 rm -f conftest.val
 else
-  ac_cv_sizeof_voidp=0
+  ac_cv_sizeof_void_p=0
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
-echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
 
 
@@ -56952,6 +56952,8 @@
 
           ac_config_files="$ac_config_files libraries/clib/Makefile"
 
+          ac_config_files="$ac_config_files libraries/clib/classpath/Makefile"
+
           ac_config_files="$ac_config_files libraries/clib/native/Makefile"
 
           ac_config_files="$ac_config_files libraries/clib/io/Makefile"
@@ -56974,8 +56976,6 @@
 
           ac_config_files="$ac_config_files libraries/clib/awt/classpath-gtk/Makefile"
 
-          ac_config_files="$ac_config_files libraries/clib/awt/classpath-gtk/classpath/Makefile"
-
           ac_config_files="$ac_config_files libraries/clib/awt/classpath-gtk/gtk-peer/Makefile"
 
           ac_config_files="$ac_config_files libraries/clib/awt/classpath-gtk/resource/Makefile"
@@ -57876,6 +57876,7 @@
   "libraries/javalib/awt-implementations/kaffe/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/awt-implementations/kaffe/Makefile" ;;
   "libraries/javalib/gmp-math/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/gmp-math/Makefile" ;;
   "libraries/clib/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/Makefile" ;;
+  "libraries/clib/classpath/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/classpath/Makefile" ;;
   "libraries/clib/native/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/native/Makefile" ;;
   "libraries/clib/io/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/io/Makefile" ;;
   "libraries/clib/libxmlj/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/libxmlj/Makefile" ;;
@@ -57887,7 +57888,6 @@
   "libraries/clib/security/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/security/Makefile" ;;
   "libraries/clib/awt/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/Makefile" ;;
   "libraries/clib/awt/classpath-gtk/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/Makefile" ;;
-  "libraries/clib/awt/classpath-gtk/classpath/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/classpath/Makefile" ;;
   "libraries/clib/awt/classpath-gtk/gtk-peer/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/gtk-peer/Makefile" ;;
   "libraries/clib/awt/classpath-gtk/resource/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/resource/Makefile" ;;
   "libraries/clib/awt/X/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/X/Makefile" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.90 kaffe/configure.ac:1.91
--- kaffe/configure.ac:1.90	Sun Nov 28 13:08:32 2004
+++ kaffe/configure.ac	Wed Dec  1 02:41:46 2004
@@ -781,7 +781,7 @@
 AC_CHECK_SIZEOF(long,0)
 AC_CHECK_SIZEOF(long long,0)
 AC_CHECK_SIZEOF(__int64,0)
-AC_CHECK_SIZEOF(void*,0)
+AC_CHECK_SIZEOF(void *,0)
 
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
@@ -2168,6 +2168,7 @@
 AC_CONFIG_FILES([libraries/javalib/awt-implementations/kaffe/Makefile])
 AC_CONFIG_FILES([libraries/javalib/gmp-math/Makefile])
 AC_CONFIG_FILES([libraries/clib/Makefile])
+AC_CONFIG_FILES([libraries/clib/classpath/Makefile])
 AC_CONFIG_FILES([libraries/clib/native/Makefile])
 AC_CONFIG_FILES([libraries/clib/io/Makefile])
 AC_CONFIG_FILES([libraries/clib/libxmlj/Makefile])
@@ -2179,7 +2180,6 @@
 AC_CONFIG_FILES([libraries/clib/security/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/Makefile])
-AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/classpath/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/gtk-peer/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/resource/Makefile])
 AC_CONFIG_FILES([libraries/clib/awt/X/Makefile])
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.130 kaffe/config/config.h.in:1.131
--- kaffe/config/config.h.in:1.130	Mon Nov 22 17:23:37 2004
+++ kaffe/config/config.h.in	Wed Dec  1 02:41:49 2004
@@ -778,8 +778,8 @@
 /* The size of a `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of a `void*', as computed by sizeof. */
-#undef SIZEOF_VOIDP
+/* The size of a `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
 
 /* The size of a `__int64', as computed by sizeof. */
 #undef SIZEOF___INT64
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.76 kaffe/include/Makefile.am:1.77
--- kaffe/include/Makefile.am:1.76	Sun Oct 24 12:19:34 2004
+++ kaffe/include/Makefile.am	Wed Dec  1 02:41:50 2004
@@ -112,7 +112,7 @@
 	gnu_java_nio_NIOServerSocket.h \
 	gnu_java_nio_SelectorImpl.h \
 	java_nio_channels_Channels.h \
-	java_nio_DirectByteBufferImpl.h \
+	java_nio_VMDirectByteBuffer.h \
 	java_nio_MappedByteBufferImpl.h \
 	kaffe_io_ByteToCharDefault.h \
 	kaffe_io_ByteToCharIconv.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.193 kaffe/include/Makefile.in:1.194
--- kaffe/include/Makefile.in:1.193	Mon Nov 22 17:23:38 2004
+++ kaffe/include/Makefile.in	Wed Dec  1 02:41:50 2004
@@ -459,7 +459,7 @@
 	gnu_java_nio_NIOServerSocket.h \
 	gnu_java_nio_SelectorImpl.h \
 	java_nio_channels_Channels.h \
-	java_nio_DirectByteBufferImpl.h \
+	java_nio_VMDirectByteBuffer.h \
 	java_nio_MappedByteBufferImpl.h \
 	kaffe_io_ByteToCharDefault.h \
 	kaffe_io_ByteToCharIconv.h \
Index: kaffe/include/kaffe/jni_md.h.in
diff -u kaffe/include/kaffe/jni_md.h.in:1.1 kaffe/include/kaffe/jni_md.h.in:1.2
--- kaffe/include/kaffe/jni_md.h.in:1.1	Mon Jul  5 16:40:14 2004
+++ kaffe/include/kaffe/jni_md.h.in	Wed Dec  1 02:41:50 2004
@@ -18,7 +18,7 @@
 #undef	SIZEOF_LONG
 #undef	SIZEOF_LONG_LONG
 #undef	SIZEOF___INT64
-#undef	SIZEOF_VOIDP
+#undef	SIZEOF_VOID_P
 
 typedef float		jfloat;
 typedef double		jdouble;
@@ -55,9 +55,9 @@
 typedef	jbyte		jboolean;
 
 /* An integer type big enough for a pointer or a 32-bit int/float. */
-#if SIZEOF_VOIDP <= SIZEOF_INT
+#if SIZEOF_VOID_P <= SIZEOF_INT
 typedef jint		jword;
-#elif SIZEOF_VOIDP <= SIZEOF_LONG
+#elif SIZEOF_VOID_P <= SIZEOF_LONG
 typedef jlong		jword;
 #else
 #error "both sizeof(int) and sizeof(long) < sizeof(void*)"
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.45 kaffe/kaffe/kaffeh/support.c:1.46
--- kaffe/kaffe/kaffeh/support.c:1.45	Sun Sep  5 15:56:43 2004
+++ kaffe/kaffe/kaffeh/support.c	Wed Dec  1 02:41:50 2004
@@ -454,7 +454,7 @@
 		sprintf(cval, "%.7e", *(float*)&CLASS_CONST_DATA(this,idx));
 		break;
 	case CONSTANT_Long:
-#if SIZEOF_VOIDP == 8
+#if SIZEOF_VOID_P == 8
 		sprintf(cval, "0x%016lx", CLASS_CONST_DATA(this,idx));
 #else
 #if defined(WORDS_BIGENDIAN)
Index: kaffe/kaffe/kaffevm/classMethod.h
diff -u kaffe/kaffe/kaffevm/classMethod.h:1.68 kaffe/kaffe/kaffevm/classMethod.h:1.69
--- kaffe/kaffe/kaffevm/classMethod.h:1.68	Thu Aug 19 19:29:02 2004
+++ kaffe/kaffe/kaffevm/classMethod.h	Wed Dec  1 02:41:51 2004
@@ -455,7 +455,7 @@
 #define CLASS_CONST_DATA(CL, IDX) ((CL)->constants.data[IDX])
 #define CLASS_CONST_UTF8(CL, IDX) WORD2UTF(CLASS_CONST_DATA(CL, IDX))
 #define CLASS_CONST_INT(CL, IDX) ((int32) CLASS_CONST_DATA(CL, IDX))
-#if SIZEOF_VOIDP == 8
+#if SIZEOF_VOID_P == 8
 #define CLASS_CONST_LONG(CL, IDX) \
   ((uint64) CLASS_CONST_DATA(CL, IDX))
 #else
Index: kaffe/kaffe/kaffevm/constants.c
diff -u kaffe/kaffe/kaffevm/constants.c:1.19 kaffe/kaffe/kaffevm/constants.c:1.20
--- kaffe/kaffe/kaffevm/constants.c:1.19	Sat Jul 17 07:57:13 2004
+++ kaffe/kaffe/kaffevm/constants.c	Wed Dec  1 02:41:51 2004
@@ -146,7 +146,7 @@
 				goto fail;
 			readu4(&d4, fp);
 			readu4(&d4b, fp);
-#if SIZEOF_VOIDP == 8
+#if SIZEOF_VOID_P == 8
 			pool[i] = WORDS_TO_LONG(d4, d4b);
 			i++;
 			pool[i] = 0;
@@ -154,7 +154,7 @@
 			pool[i] = d4;
 			i++;
 			pool[i] = d4b;
-#endif /* SIZEOF_VOIDP == 8 */
+#endif /* SIZEOF_VOID_P == 8 */
 			tags[i] = CONSTANT_Unknown;
 			break;
 
@@ -164,7 +164,7 @@
 			readu4(&d4, fp);
 			readu4(&d4b, fp);
 
-#if SIZEOF_VOIDP == 8
+#if SIZEOF_VOID_P == 8
 #if defined(DOUBLE_ORDER_OPPOSITE)
 			pool[i] = WORDS_TO_LONG(d4b, d4);
 #else
@@ -182,7 +182,7 @@
 			i++;
 			pool[i] = d4b;
 #endif /* DOUBLE_ORDER_OPPOSITE */
-#endif /* SIZEOF_VOIDP == 8 */
+#endif /* SIZEOF_VOID_P == 8 */
 			tags[i] = CONSTANT_Unknown;
 			break;
 
Index: kaffe/kaffe/kaffevm/gtypes.h
diff -u kaffe/kaffe/kaffevm/gtypes.h:1.13 kaffe/kaffe/kaffevm/gtypes.h:1.14
--- kaffe/kaffe/kaffevm/gtypes.h:1.13	Mon Jul  5 16:40:37 2004
+++ kaffe/kaffe/kaffevm/gtypes.h	Wed Dec  1 02:41:51 2004
@@ -92,9 +92,9 @@
 #error "sizeof(long) or sizeof(long long) or sizeof(__int64) must be 8"
 #endif
 
-#if SIZEOF_VOIDP == 4
+#if SIZEOF_VOID_P == 4
 typedef uint32			uintp;
-#elif SIZEOF_VOIDP == 8
+#elif SIZEOF_VOID_P == 8
 typedef uint64			uintp;
 #else
 #error "sizeof(void*) must be 4 or 8"
@@ -126,7 +126,7 @@
 typedef struct _strconst Utf8Const;
 #endif
 
-#define PTR_TYPE_SIZE	SIZEOF_VOIDP
+#define PTR_TYPE_SIZE	SIZEOF_VOID_P
 
 struct _constants;
 struct _methodTable;
@@ -147,9 +147,9 @@
 #define	SHIFT_jlong		3
 #define	SHIFT_jfloat		2
 #define	SHIFT_jdouble		3
-#if SIZEOF_VOIDP == 4
+#if SIZEOF_VOID_P == 4
 #define	SHIFT_jref		2
-#elif SIZEOF_VOIDP == 8
+#elif SIZEOF_VOID_P == 8
 #define	SHIFT_jref		3
 #endif
 
Index: kaffe/kaffe/xprof/memorySamples.c
diff -u kaffe/kaffe/xprof/memorySamples.c:1.7 kaffe/kaffe/xprof/memorySamples.c:1.8
--- kaffe/kaffe/xprof/memorySamples.c:1.7	Sat Sep 18 20:48:17 2004
+++ kaffe/kaffe/xprof/memorySamples.c	Wed Dec  1 02:41:51 2004
@@ -36,7 +36,7 @@
 #define SAMPLE_LEAF_COUNT (SAMPLE_BRANCH_COUNT / 2)
 
 /* Address size */
-#define SAMPLE_ADDRESS_BYTES SIZEOF_VOIDP
+#define SAMPLE_ADDRESS_BYTES SIZEOF_VOID_P
 #define SAMPLE_ADDRESS_BITS (SAMPLE_ADDRESS_BYTES * 8)
 
 #define SAMPLE_BRANCH_LEVELS (SAMPLE_ADDRESS_BYTES - 1)
Index: kaffe/libraries/clib/Makefile.am
diff -u kaffe/libraries/clib/Makefile.am:1.11 kaffe/libraries/clib/Makefile.am:1.12
--- kaffe/libraries/clib/Makefile.am:1.11	Sun Jul 25 07:59:53 2004
+++ kaffe/libraries/clib/Makefile.am	Wed Dec  1 02:41:51 2004
@@ -9,6 +9,6 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-SUBDIRS = native io nio net zip math security management
+SUBDIRS = classpath native io nio net zip math security management
 
-DIST_SUBDIRS = native io nio net zip math libxmlj security management awt sound
+DIST_SUBDIRS = classpath native io nio net zip math libxmlj security management awt sound
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.127 kaffe/libraries/clib/Makefile.in:1.128
--- kaffe/libraries/clib/Makefile.in:1.127	Mon Nov 22 17:23:54 2004
+++ kaffe/libraries/clib/Makefile.in	Wed Dec  1 02:41:51 2004
@@ -350,8 +350,8 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
-SUBDIRS = native io nio net zip math security management
-DIST_SUBDIRS = native io nio net zip math libxmlj security management awt sound
+SUBDIRS = classpath native io nio net zip math security management
+DIST_SUBDIRS = classpath native io nio net zip math libxmlj security management awt sound
 all: all-recursive
 
 .SUFFIXES:
Index: kaffe/libraries/clib/awt/classpath-gtk/Makefile.am
diff -u kaffe/libraries/clib/awt/classpath-gtk/Makefile.am:1.1 kaffe/libraries/clib/awt/classpath-gtk/Makefile.am:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/Makefile.am:1.1	Thu Jul 22 19:03:58 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/Makefile.am	Wed Dec  1 02:41:53 2004
@@ -6,4 +6,4 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-SUBDIRS = classpath gtk-peer resource
+SUBDIRS = gtk-peer resource
Index: kaffe/libraries/clib/awt/classpath-gtk/Makefile.in
diff -u kaffe/libraries/clib/awt/classpath-gtk/Makefile.in:1.11 kaffe/libraries/clib/awt/classpath-gtk/Makefile.in:1.12
--- kaffe/libraries/clib/awt/classpath-gtk/Makefile.in:1.11	Mon Nov 22 17:23:55 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/Makefile.in	Wed Dec  1 02:41:53 2004
@@ -348,7 +348,7 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
-SUBDIRS = classpath gtk-peer resource
+SUBDIRS = gtk-peer resource
 all: all-recursive
 
 .SUFFIXES:
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.7 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.8
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.7	Sun Oct 24 12:19:35 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am	Wed Dec  1 02:41:53 2004
@@ -60,11 +60,14 @@
 	@GTK_CFLAGS@ \
 	@CAIRO_CFLAGS@ \
 	@PANGOFT2_CFLAGS@ \
-	-I$(top_srcdir)/libraries/clib/awt/classpath-gtk/classpath/ \
+	-I$(top_srcdir)/libraries/clib/classpath/ \
 	-I$(top_builddir)/include/
 
+libgtkpeer_la_DEPENDENCIES = \
+	$(top_builddir)/libraries/clib/classpath/libclasspath.la
+
 libgtkpeer_la_LIBADD = \
-	$(top_builddir)/libraries/clib/awt/classpath-gtk/classpath/native_state.lo
+	$(libgtkpeer_la_DEPENDENCIES)
 
 libgtkpeer_la_LDFLAGS = \
 	@CLASSPATH_MODULE@ \
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.14 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.15
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.14	Mon Nov 22 17:23:56 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in	Wed Dec  1 02:41:53 2004
@@ -74,7 +74,8 @@
 am__installdirs = "$(DESTDIR)$(nativedir)"
 nativeLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(native_LTLIBRARIES)
-libgtkpeer_la_DEPENDENCIES = $(top_builddir)/libraries/clib/awt/classpath-gtk/classpath/native_state.lo
+am__DEPENDENCIES_1 =  \
+	$(top_builddir)/libraries/clib/classpath/libclasspath.la
 am__libgtkpeer_la_SOURCES_DIST =  \
 	gnu_java_awt_peer_gtk_GdkGlyphVector.c \
 	gnu_java_awt_peer_gtk_GdkGraphics2D.c gdkfont.h \
@@ -500,11 +501,14 @@
 	@GTK_CFLAGS@ \
 	@CAIRO_CFLAGS@ \
 	@PANGOFT2_CFLAGS@ \
-	-I$(top_srcdir)/libraries/clib/awt/classpath-gtk/classpath/ \
+	-I$(top_srcdir)/libraries/clib/classpath/ \
 	-I$(top_builddir)/include/
 
+libgtkpeer_la_DEPENDENCIES = \
+	$(top_builddir)/libraries/clib/classpath/libclasspath.la
+
 libgtkpeer_la_LIBADD = \
-	$(top_builddir)/libraries/clib/awt/classpath-gtk/classpath/native_state.lo
+	$(libgtkpeer_la_DEPENDENCIES)
 
 libgtkpeer_la_LDFLAGS = \
 	@CLASSPATH_MODULE@ \
===================================================================
Checking out kaffe/libraries/clib/classpath/.cvsignore
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/classpath/.cvsignore,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/clib/classpath/.cvsignore	Wed Dec  1 08:26:13 2004
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
===================================================================
Checking out kaffe/libraries/clib/classpath/Makefile.am
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/classpath/Makefile.am,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/clib/classpath/Makefile.am	Wed Dec  1 08:26:13 2004
@@ -0,0 +1,12 @@
+native_LTLIBRARIES = libclasspath.la
+
+AM_CPPFLAGS = \
+        -I$(top_srcdir)/kaffe/jvmpi -I$(top_builddir)/include \
+        -I$(top_srcdir)/kaffe/kaffevm/jni
+
+libclasspath_la_SOURCES = jcl.c jcl.h \
+			  jnilink.c jnilink.h \
+			  primlib.c primlib.h \
+			  native_state.c native_state.h
+
+libclasspath_la_LDFLAGS = @CLASSPATH_MODULE@
===================================================================
Checking out kaffe/libraries/clib/classpath/Makefile.in
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/classpath/Makefile.in,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/clib/classpath/Makefile.in	Wed Dec  1 08:26:13 2004
@@ -0,0 +1,650 @@
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+SOURCES = $(libclasspath_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = libraries/clib/classpath
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
+	$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
+	$(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \
+	$(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/gcc_attribute.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibcver.m4 \
+	$(top_srcdir)/m4/gmp.m4 $(top_srcdir)/m4/gwqt.m4 \
+	$(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/libxml.m4 $(top_srcdir)/m4/libxslt.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/semaphore.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
+	$(top_srcdir)/m4/sockinttypes.m4 \
+	$(top_srcdir)/m4/solarispthread.m4 $(top_srcdir)/m4/valist.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config/config.h \
+	$(top_builddir)/include/kaffe/jni_md.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(nativedir)"
+nativeLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(native_LTLIBRARIES)
+libclasspath_la_LIBADD =
+am_libclasspath_la_OBJECTS = jcl.lo jnilink.lo primlib.lo \
+	native_state.lo
+libclasspath_la_OBJECTS = $(am_libclasspath_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libclasspath_la_SOURCES)
+DIST_SOURCES = $(libclasspath_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+AWT_LIBS = @AWT_LIBS@
+BCEL_JAR = @BCEL_JAR@
+BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
+BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CCLD = @CCLD@
+CFLAGS = @CFLAGS@
+CFLAGS_PG = @CFLAGS_PG@
+CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
+COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
+COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
+COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
+COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
+COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
+COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
+COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
+COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
+COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
+COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
+COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
+COND_SOUND_ALSA_TRUE = @COND_SOUND_ALSA_TRUE@
+COND_SOUND_ESD_FALSE = @COND_SOUND_ESD_FALSE@
+COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
+CONFIG_CALLKAFFEEXCEPTION_H = @CONFIG_CALLKAFFEEXCEPTION_H@
+CONFIG_JIT_MD_H = @CONFIG_JIT_MD_H@
+CONFIG_MD_H = @CONFIG_MD_H@
+CONFIG_XPROFILE_MD_H = @CONFIG_XPROFILE_MD_H@
+CPP = @CPP@

*** Patch too long, truncated ***




More information about the kaffe mailing list