PatchSet 7394
Date: 2006/08/24 11:06:19
Author: robilad
Branch: HEAD
Tag: (none)
Log:
switched io over to gnu classpath's version
2006-08-24 Dalibor Topic <[EMAIL PROTECTED]>
Switched io libraries to GNU Classpath's version.
* libraries/clib/io/Makefile.am,
libraries/clib/io/Makefile.in,
libraries/clib/io/java_io_VMObjectInputStream.c,
libraries/clib/io/java_io_VMObjectStreamClass.c:
Removed.
* Makefile.am (BUILD_ENVIRONMENT-make): Set KAFFELIBRARYPATH to GNU
Classpath's
java-io native library.
* configure.ac (JAVA_LIBS) Removed kaffe's native io library.
Don't output Makefile for Kaffe's native io libraries.
* kaffe/kaffevm/Makefile.am: Added Kaffe's native io code
implementation to the library.
* libraries/clib/Makefile.am: (SUBDIRS) Removed io.
Members:
ChangeLog:1.4896->1.4897
Makefile.am:1.117->1.118
Makefile.in:1.267->1.268
configure:1.570->1.571
configure.ac:1.249->1.250
kaffe/kaffevm/Makefile.am:1.86->1.87
kaffe/kaffevm/Makefile.in:1.243->1.244
libraries/clib/Makefile.am:1.27->1.28
libraries/clib/Makefile.in:1.185->1.186
libraries/clib/io/Makefile.am:1.23->1.24(DEAD)
libraries/clib/io/Makefile.in:1.181->1.182(DEAD)
libraries/clib/io/java_io_VMObjectInputStream.c:1.3->1.4(DEAD)
libraries/clib/io/java_io_VMObjectStreamClass.c:1.3->1.4(DEAD)
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4896 kaffe/ChangeLog:1.4897
--- kaffe/ChangeLog:1.4896 Thu Aug 24 01:05:18 2006
+++ kaffe/ChangeLog Thu Aug 24 11:06:19 2006
@@ -1,3 +1,24 @@
+2006-08-24 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Switched io libraries to GNU Classpath's version.
+
+ * libraries/clib/io/Makefile.am,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/io/java_io_VMObjectInputStream.c,
+ libraries/clib/io/java_io_VMObjectStreamClass.c:
+ Removed.
+
+ * Makefile.am (BUILD_ENVIRONMENT-make): Set KAFFELIBRARYPATH to GNU
Classpath's
+ java-io native library.
+
+ * configure.ac (JAVA_LIBS) Removed kaffe's native io library.
+ Don't output Makefile for Kaffe's native io libraries.
+
+ * kaffe/kaffevm/Makefile.am: Added Kaffe's native io code
+ implementation to the library.
+
+ * libraries/clib/Makefile.am: (SUBDIRS) Removed io.
+
2006-08-23 Dalibor Topic <[EMAIL PROTECTED]>
Switched net libraries to GNU Classpath's version.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.117 kaffe/Makefile.am:1.118
--- kaffe/Makefile.am:1.117 Thu Aug 24 01:05:21 2006
+++ kaffe/Makefile.am Thu Aug 24 11:06:23 2006
@@ -175,7 +175,7 @@
BUILD_ENVIRONMENT-make: Makefile
echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
- echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\;
export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\;
export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.267 kaffe/Makefile.in:1.268
--- kaffe/Makefile.in:1.267 Thu Aug 24 01:05:22 2006
+++ kaffe/Makefile.in Thu Aug 24 11:06:23 2006
@@ -988,7 +988,7 @@
BUILD_ENVIRONMENT-make: Makefile
echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
- echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\;
export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\;
export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/configure
diff -u kaffe/configure:1.570 kaffe/configure:1.571
--- kaffe/configure:1.570 Thu Aug 24 01:05:22 2006
+++ kaffe/configure Thu Aug 24 11:06:23 2006
@@ -50090,7 +50090,6 @@
JAVA_LIBS=" \
\$(top_builddir)/libraries/clib/native/libjavalang.la \
-\$(top_builddir)/libraries/clib/io/libjavaio.la \
\$(top_builddir)/libraries/clib/management/libmanagement.la \
\$(top_builddir)/libraries/clib/security/libsecurity.la \
$JAVA_LIBS \
@@ -51191,8 +51190,6 @@
ac_config_files="$ac_config_files libraries/clib/native/Makefile"
- ac_config_files="$ac_config_files libraries/clib/io/Makefile"
-
ac_config_files="$ac_config_files libraries/clib/zip/Makefile"
ac_config_files="$ac_config_files libraries/clib/math/Makefile"
@@ -52207,7 +52204,6 @@
"libraries/clib/target/generic/Makefile" ) CONFIG_FILES="$CONFIG_FILES
libraries/clib/target/generic/Makefile" ;;
"libraries/clib/target/Linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES
libraries/clib/target/Linux/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/zip/Makefile" ) CONFIG_FILES="$CONFIG_FILES
libraries/clib/zip/Makefile" ;;
"libraries/clib/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES
libraries/clib/math/Makefile" ;;
"libraries/clib/management/Makefile" ) CONFIG_FILES="$CONFIG_FILES
libraries/clib/management/Makefile" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.249 kaffe/configure.ac:1.250
--- kaffe/configure.ac:1.249 Thu Aug 24 01:05:31 2006
+++ kaffe/configure.ac Thu Aug 24 11:06:30 2006
@@ -2207,7 +2207,6 @@
JAVA_LIBS=" \
\$(top_builddir)/libraries/clib/native/libjavalang.la \
-\$(top_builddir)/libraries/clib/io/libjavaio.la \
\$(top_builddir)/libraries/clib/management/libmanagement.la \
\$(top_builddir)/libraries/clib/security/libsecurity.la \
$JAVA_LIBS \
@@ -2564,7 +2563,6 @@
AC_CONFIG_FILES([libraries/clib/target/generic/Makefile])
AC_CONFIG_FILES([libraries/clib/target/Linux/Makefile])
AC_CONFIG_FILES([libraries/clib/native/Makefile])
-AC_CONFIG_FILES([libraries/clib/io/Makefile])
AC_CONFIG_FILES([libraries/clib/zip/Makefile])
AC_CONFIG_FILES([libraries/clib/math/Makefile])
AC_CONFIG_FILES([libraries/clib/management/Makefile])
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.86
kaffe/kaffe/kaffevm/Makefile.am:1.87
--- kaffe/kaffe/kaffevm/Makefile.am:1.86 Thu Aug 24 01:05:37 2006
+++ kaffe/kaffe/kaffevm/Makefile.am Thu Aug 24 11:06:31 2006
@@ -130,7 +130,10 @@
$(top_srcdir)/libraries/clib/net/InetAddressImpl.c \
$(top_srcdir)/libraries/clib/net/NetworkInterface.c \
$(top_srcdir)/libraries/clib/net/PlainDatagramSocketImpl.c \
- $(top_srcdir)/libraries/clib/net/PlainSocketImpl.c
+ $(top_srcdir)/libraries/clib/net/PlainSocketImpl.c \
+ $(top_srcdir)/libraries/clib/io/File.c \
+ $(top_srcdir)/libraries/clib/io/java_io_VMFile.c
+
noinst_HEADERS = \
access.h \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.243
kaffe/kaffe/kaffevm/Makefile.in:1.244
--- kaffe/kaffe/kaffevm/Makefile.in:1.243 Thu Aug 24 01:05:37 2006
+++ kaffe/kaffe/kaffevm/Makefile.in Thu Aug 24 11:06:32 2006
@@ -120,7 +120,8 @@
libkaffevm_la-InetAddressImpl.lo \
libkaffevm_la-NetworkInterface.lo \
libkaffevm_la-PlainDatagramSocketImpl.lo \
- libkaffevm_la-PlainSocketImpl.lo
+ libkaffevm_la-PlainSocketImpl.lo libkaffevm_la-File.lo \
+ libkaffevm_la-java_io_VMFile.lo
nodist_libkaffevm_la_OBJECTS = libkaffevm_la-md.lo
libkaffevm_la_OBJECTS = $(am_libkaffevm_la_OBJECTS) \
$(nodist_libkaffevm_la_OBJECTS)
@@ -522,7 +523,9 @@
$(top_srcdir)/libraries/clib/net/InetAddressImpl.c \
$(top_srcdir)/libraries/clib/net/NetworkInterface.c \
$(top_srcdir)/libraries/clib/net/PlainDatagramSocketImpl.c \
- $(top_srcdir)/libraries/clib/net/PlainSocketImpl.c
+ $(top_srcdir)/libraries/clib/net/PlainSocketImpl.c \
+ $(top_srcdir)/libraries/clib/io/File.c \
+ $(top_srcdir)/libraries/clib/io/java_io_VMFile.c
noinst_HEADERS = \
access.h \
@@ -632,6 +635,7 @@
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -656,6 +660,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -966,6 +971,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@
source='$(top_srcdir)/libraries/clib/net/PlainSocketImpl.c'
object='libkaffevm_la-PlainSocketImpl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-PlainSocketImpl.lo `test
-f '$(top_srcdir)/libraries/clib/net/PlainSocketImpl.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/net/PlainSocketImpl.c
+
+libkaffevm_la-File.lo: $(top_srcdir)/libraries/clib/io/File.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-File.lo -MD -MP -MF
"$(DEPDIR)/libkaffevm_la-File.Tpo" -c -o libkaffevm_la-File.lo `test -f
'$(top_srcdir)/libraries/clib/io/File.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/io/File.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libkaffevm_la-File.Tpo"
"$(DEPDIR)/libkaffevm_la-File.Plo"; else rm -f
"$(DEPDIR)/libkaffevm_la-File.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@
source='$(top_srcdir)/libraries/clib/io/File.c' object='libkaffevm_la-File.lo'
libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-File.lo `test -f
'$(top_srcdir)/libraries/clib/io/File.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/io/File.c
+
+libkaffevm_la-java_io_VMFile.lo:
$(top_srcdir)/libraries/clib/io/java_io_VMFile.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-java_io_VMFile.lo -MD -MP
-MF "$(DEPDIR)/libkaffevm_la-java_io_VMFile.Tpo" -c -o
libkaffevm_la-java_io_VMFile.lo `test -f
'$(top_srcdir)/libraries/clib/io/java_io_VMFile.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/io/java_io_VMFile.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libkaffevm_la-java_io_VMFile.Tpo"
"$(DEPDIR)/libkaffevm_la-java_io_VMFile.Plo"; else rm -f
"$(DEPDIR)/libkaffevm_la-java_io_VMFile.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@
source='$(top_srcdir)/libraries/clib/io/java_io_VMFile.c'
object='libkaffevm_la-java_io_VMFile.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-java_io_VMFile.lo `test
-f '$(top_srcdir)/libraries/clib/io/java_io_VMFile.c' || echo
'$(srcdir)/'`$(top_srcdir)/libraries/clib/io/java_io_VMFile.c
libkaffevm_la-md.lo: md.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-md.lo -MD -MP -MF
"$(DEPDIR)/libkaffevm_la-md.Tpo" -c -o libkaffevm_la-md.lo `test -f 'md.c' ||
echo '$(srcdir)/'`md.c; \
Index: kaffe/libraries/clib/Makefile.am
diff -u kaffe/libraries/clib/Makefile.am:1.27
kaffe/libraries/clib/Makefile.am:1.28
--- kaffe/libraries/clib/Makefile.am:1.27 Thu Aug 24 01:05:52 2006
+++ kaffe/libraries/clib/Makefile.am Thu Aug 24 11:06:33 2006
@@ -29,7 +29,6 @@
SUBDIRS = \
target \
native \
- io \
security \
management \
$(MAYBE_NATIVE_AWT_DIR) \
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.185
kaffe/libraries/clib/Makefile.in:1.186
--- kaffe/libraries/clib/Makefile.in:1.185 Thu Aug 24 01:05:52 2006
+++ kaffe/libraries/clib/Makefile.in Thu Aug 24 11:06:33 2006
@@ -84,7 +84,7 @@
uninstall-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = target native io security management awt math sound zip
+DIST_SUBDIRS = target native security management awt math sound zip
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -364,7 +364,6 @@
SUBDIRS = \
target \
native \
- io \
security \
management \
$(MAYBE_NATIVE_AWT_DIR) \
===================================================================
Checking out kaffe/libraries/clib/io/Makefile.am
RCS: /home/cvs/kaffe/kaffe/libraries/clib/io/Attic/Makefile.am,v
VERS: 1.23
***************
--- kaffe/libraries/clib/io/Makefile.am Thu Aug 24 11:19:34 2006
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,39 +0,0 @@
-# File system (IO) support for Java libraries
-#
-# Copyright (c) 1996, 1997, 1998, 1999
-# Transvirtual Technologies, Inc. All rights reserved.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file.
-
-AM_CFLAGS= $(KAFFE_CFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/kaffe/kaffevm/jni \
-
-I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath
-
-native_LTLIBRARIES = libjavaio.la
-
-libjavaio_la_CFLAGS = \
- $(KAFFE_CFLAGS) \
- $(CFLAGS_PG)
-
-libjavaio_la_LDFLAGS = \
- $(KLIBFLAGS) \
- -no-undefined \
- -module \
- -release $(PACKAGE_VERSION) \
- -export-symbols-regex "^([Jj]ava|kaffe)_"
-
-libjavaio_la_LIBADD = \
- $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
-
$(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la
-
-libjavaio_la_SOURCES = \
- File.c \
- java_io_VMFile.c \
- java_io_VMObjectInputStream.c \
- java_io_VMObjectStreamClass.c
-
-CLEANFILES = so_locations
===================================================================
Checking out kaffe/libraries/clib/io/Makefile.in
RCS: /home/cvs/kaffe/kaffe/libraries/clib/io/Attic/Makefile.in,v
VERS: 1.181
***************
--- kaffe/libraries/clib/io/Makefile.in Thu Aug 24 11:19:34 2006
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,713 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
[EMAIL PROTECTED]@
-
-# File system (IO) support for Java libraries
-#
-# Copyright (c) 1996, 1997, 1998, 1999
-# Transvirtual Technologies, Inc. All rights reserved.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file.
-
-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/io
-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/ax_cflags_warn_all.m4 \
- $(top_srcdir)/m4/ax_create_stdint_h.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/getopt.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/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/semaphore.m4 $(top_srcdir)/m4/size_max.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
-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)
-libjavaio_la_DEPENDENCIES = \
- $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
-
$(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la
-am_libjavaio_la_OBJECTS = libjavaio_la-File.lo \
- libjavaio_la-java_io_VMFile.lo \
- libjavaio_la-java_io_VMObjectInputStream.lo \
- libjavaio_la-java_io_VMObjectStreamClass.lo
-libjavaio_la_OBJECTS = $(am_libjavaio_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libjavaio_la_SOURCES)
-DIST_SOURCES = $(libjavaio_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@
-BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CCLD = @CCLD@
-CFLAGS = @CFLAGS@
-CFLAGS_PG = @CFLAGS_PG@
-CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
-CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
-COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
-COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
-COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
-COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
-COND_FASTJAR_FALSE = @COND_FASTJAR_FALSE@
-COND_FASTJAR_TRUE = @COND_FASTJAR_TRUE@
-COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
-COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
-COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
-COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
-COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
-COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
-COND_KAFFE_XYNTH_AWT_FALSE = @COND_KAFFE_XYNTH_AWT_FALSE@
-COND_KAFFE_XYNTH_AWT_TRUE = @COND_KAFFE_XYNTH_AWT_TRUE@
-COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
-COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
-COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
-COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
-COND_NATIVE_SOUND_FALSE = @COND_NATIVE_SOUND_FALSE@
-COND_NATIVE_SOUND_TRUE = @COND_NATIVE_SOUND_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@
-COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@
-COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@
-COND_ZLIB_ZIP_FALSE = @COND_ZLIB_ZIP_FALSE@
-COND_ZLIB_ZIP_TRUE = @COND_ZLIB_ZIP_TRUE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@
-CREATE_ALSA_LIBRARIES_TRUE = @CREATE_ALSA_LIBRARIES_TRUE@
-CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
-CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
-CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
-CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
-CREATE_PLUGIN_FALSE = @CREATE_PLUGIN_FALSE@
-CREATE_PLUGIN_TRUE = @CREATE_PLUGIN_TRUE@
-CREATE_XMLJ_LIBRARY_FALSE = @CREATE_XMLJ_LIBRARY_FALSE@
-CREATE_XMLJ_LIBRARY_TRUE = @CREATE_XMLJ_LIBRARY_TRUE@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRSEP = @DIRSEP@
-DLLTOOL = @DLLTOOL@
-DLOPEN_JAVA_LIBS = @DLOPEN_JAVA_LIBS@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_JVMPI_FALSE = @ENABLE_JVMPI_FALSE@
-ENABLE_JVMPI_TRUE = @ENABLE_JVMPI_TRUE@
-ENABLE_XPROF_FALSE = @ENABLE_XPROF_FALSE@
-ENABLE_XPROF_TRUE = @ENABLE_XPROF_TRUE@
-ENGINE_NAME = @ENGINE_NAME@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FASTJAR = @FASTJAR@
-FFLAGS = @FFLAGS@
-GC_NAME = @GC_NAME@
-GETOPT_H = @GETOPT_H@
-GLIBJ_ZIP = @GLIBJ_ZIP@
-GMSGFMT = @GMSGFMT@
-HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
-HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
-HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
-HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
-HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
-HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
-HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
-HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
-HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-JASMIN = @JASMIN@
-JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
-JAVA_LIBS = @JAVA_LIBS@
-JIKESPROG = @JIKESPROG@
-KAFFEH = @KAFFEH@
-KAFFE_ARCHOS = @KAFFE_ARCHOS@
-KAFFE_CCASFLAGS = @KAFFE_CCASFLAGS@
-KAFFE_CFLAGS = @KAFFE_CFLAGS@
-KAFFE_LIBS = @KAFFE_LIBS@
-KLIBFLAGS = @KLIBFLAGS@
-KPREFIX = @KPREFIX@
-KVMBINFLAGS = @KVMBINFLAGS@
-KVMLIBFLAGS = @KVMLIBFLAGS@
-Khost_cpu = @Khost_cpu@
-Khost_os = @Khost_os@
-LDFLAGS = @LDFLAGS@
-LIBADD_GMP = @LIBADD_GMP@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MAKE_KAFFEH = @MAKE_KAFFEH@
-MATH_LIB = @MATH_LIB@
-MAY_RUN_PO_FALSE = @MAY_RUN_PO_FALSE@
-MAY_RUN_PO_TRUE = @MAY_RUN_PO_TRUE@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MKTEMP = @MKTEMP@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-M_LIBS = @M_LIBS@
-NANOX_CFLAGS = @NANOX_CFLAGS@
-NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
-NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
-NET_LIBS = @NET_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATHSEP = @PATHSEP@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
-QEMBED = @QEMBED@
-QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUILINK = @QT_GUILINK@
-QT_LDADD = @QT_LDADD@
-RANLIB = @RANLIB@
-REPLACE_GETOPT_FALSE = @REPLACE_GETOPT_FALSE@
-REPLACE_GETOPT_TRUE = @REPLACE_GETOPT_TRUE@
-SECURITY_LIBS = @SECURITY_LIBS@
-SEMAPHORE_LIB = @SEMAPHORE_LIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUN_COMPAT_FALSE = @SUN_COMPAT_FALSE@
-SUN_COMPAT_TRUE = @SUN_COMPAT_TRUE@
-THREAD_DIR = @THREAD_DIR@
-THREAD_SYSTEM = @THREAD_SYSTEM@
-UIC = @UIC@
-USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@
-USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@
-USE_GMP = @USE_GMP@
-USE_JIT_FALSE = @USE_JIT_FALSE@
-USE_JIT_TRUE = @USE_JIT_TRUE@
-USE_NLS = @USE_NLS@
-USE_PRECOMPILED_RT_JAR_FALSE = @USE_PRECOMPILED_RT_JAR_FALSE@
-USE_PRECOMPILED_RT_JAR_TRUE = @USE_PRECOMPILED_RT_JAR_TRUE@
-VERSION = @VERSION@
-VM_LIBS = @VM_LIBS@
-XGETTEXT = @XGETTEXT@
-XI18N_CFLAGS = @XI18N_CFLAGS@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
-abssrcdir = @abssrcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-acx_pthread_config = @acx_pthread_config@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-jrebindir = @jrebindir@
-jredir = @jredir@
-jrelibdir = @jrelibdir@
-kaffe_TRANSF = @kaffe_TRANSF@
-kaffe_builddir = @kaffe_builddir@
-kaffebin_TRANSF = @kaffebin_TRANSF@
-kaffeh_TRANSF = @kaffeh_TRANSF@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-nativedir = @nativedir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-securitydir = @securitydir@
-sharedstatedir = @sharedstatedir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-toolslibdir = @toolslibdir@
-with_engine = @with_engine@
-AM_CFLAGS = $(KAFFE_CFLAGS)
-AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/kaffe/kaffevm/jni \
-
-I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath
-
-native_LTLIBRARIES = libjavaio.la
-libjavaio_la_CFLAGS = \
- $(KAFFE_CFLAGS) \
- $(CFLAGS_PG)
-
-libjavaio_la_LDFLAGS = \
- $(KLIBFLAGS) \
- -no-undefined \
- -module \
- -release $(PACKAGE_VERSION) \
- -export-symbols-regex "^([Jj]ava|kaffe)_"
-
-libjavaio_la_LIBADD = \
- $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
-
$(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la
-
-libjavaio_la_SOURCES = \
- File.c \
- java_io_VMFile.c \
- java_io_VMObjectInputStream.c \
- java_io_VMObjectStreamClass.c
-
-CLEANFILES = so_locations
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
libraries/clib/io/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu libraries/clib/io/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nativeLTLIBRARIES: $(native_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(nativedir)" || $(mkdir_p) "$(DESTDIR)$(nativedir)"
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativedir)/$$f'"; \
- $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativedir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-nativeLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @set -x; list='$(native_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f
'$(DESTDIR)$(nativedir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativedir)/$$p"; \
- done
-
-clean-nativeLTLIBRARIES:
- -test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libjavaio.la: $(libjavaio_la_OBJECTS) $(libjavaio_la_DEPENDENCIES)
- $(LINK) -rpath $(nativedir) $(libjavaio_la_LDFLAGS)
$(libjavaio_la_OBJECTS) $(libjavaio_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
-
-.c.o:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(COMPILE) -c $<
-
-.c.obj:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
[EMAIL PROTECTED]@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo"
-c -o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LTCOMPILE) -c -o $@ $<
-
-libjavaio_la-File.lo: File.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -MT libjavaio_la-File.lo -MD -MP -MF
"$(DEPDIR)/libjavaio_la-File.Tpo" -c -o libjavaio_la-File.lo `test -f 'File.c'
|| echo '$(srcdir)/'`File.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libjavaio_la-File.Tpo"
"$(DEPDIR)/libjavaio_la-File.Plo"; else rm -f
"$(DEPDIR)/libjavaio_la-File.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='File.c'
object='libjavaio_la-File.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -c -o libjavaio_la-File.lo `test -f 'File.c'
|| echo '$(srcdir)/'`File.c
-
-libjavaio_la-java_io_VMFile.lo: java_io_VMFile.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -MT libjavaio_la-java_io_VMFile.lo -MD -MP -MF
"$(DEPDIR)/libjavaio_la-java_io_VMFile.Tpo" -c -o
libjavaio_la-java_io_VMFile.lo `test -f 'java_io_VMFile.c' || echo
'$(srcdir)/'`java_io_VMFile.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libjavaio_la-java_io_VMFile.Tpo"
"$(DEPDIR)/libjavaio_la-java_io_VMFile.Plo"; else rm -f
"$(DEPDIR)/libjavaio_la-java_io_VMFile.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='java_io_VMFile.c'
object='libjavaio_la-java_io_VMFile.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -c -o libjavaio_la-java_io_VMFile.lo `test -f
'java_io_VMFile.c' || echo '$(srcdir)/'`java_io_VMFile.c
-
-libjavaio_la-java_io_VMObjectInputStream.lo: java_io_VMObjectInputStream.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -MT
libjavaio_la-java_io_VMObjectInputStream.lo -MD -MP -MF
"$(DEPDIR)/libjavaio_la-java_io_VMObjectInputStream.Tpo" -c -o
libjavaio_la-java_io_VMObjectInputStream.lo `test -f
'java_io_VMObjectInputStream.c' || echo
'$(srcdir)/'`java_io_VMObjectInputStream.c; \
[EMAIL PROTECTED]@ then mv -f
"$(DEPDIR)/libjavaio_la-java_io_VMObjectInputStream.Tpo"
"$(DEPDIR)/libjavaio_la-java_io_VMObjectInputStream.Plo"; else rm -f
"$(DEPDIR)/libjavaio_la-java_io_VMObjectInputStream.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='java_io_VMObjectInputStream.c'
object='libjavaio_la-java_io_VMObjectInputStream.lo' libtool=yes
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -c -o
libjavaio_la-java_io_VMObjectInputStream.lo `test -f
'java_io_VMObjectInputStream.c' || echo
'$(srcdir)/'`java_io_VMObjectInputStream.c
-
-libjavaio_la-java_io_VMObjectStreamClass.lo: java_io_VMObjectStreamClass.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -MT
libjavaio_la-java_io_VMObjectStreamClass.lo -MD -MP -MF
"$(DEPDIR)/libjavaio_la-java_io_VMObjectStreamClass.Tpo" -c -o
libjavaio_la-java_io_VMObjectStreamClass.lo `test -f
'java_io_VMObjectStreamClass.c' || echo
'$(srcdir)/'`java_io_VMObjectStreamClass.c; \
[EMAIL PROTECTED]@ then mv -f
"$(DEPDIR)/libjavaio_la-java_io_VMObjectStreamClass.Tpo"
"$(DEPDIR)/libjavaio_la-java_io_VMObjectStreamClass.Plo"; else rm -f
"$(DEPDIR)/libjavaio_la-java_io_VMObjectStreamClass.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='java_io_VMObjectStreamClass.c'
object='libjavaio_la-java_io_VMObjectStreamClass.lo' libtool=yes
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavaio_la_CFLAGS) $(CFLAGS) -c -o
libjavaio_la-java_io_VMObjectStreamClass.lo `test -f
'java_io_VMObjectStreamClass.c' || echo
'$(srcdir)/'`java_io_VMObjectStreamClass.c
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(nativedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nativeLTLIBRARIES
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
