[kaffe] CVS kaffe (robilad): Build class library using jikes by default

Kaffe CVS cvs-commits at kaffe.org
Thu Jan 20 13:02:27 PST 2005 

PatchSet 5876 
Date: 2005/01/20 20:56:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Build class library using jikes by default

2005-01-20  Dalibor Topic  <robilad at kaffe.org>

* FAQ/FAQ.classlibrary-compile: Changed recommended version of jikes
to jikes 1.21.

* Makefile.am (BUILD_ENVIRONMENT-make): Remove kjc.jar from
BOOTCLASSPATH.

* kaffe/scripts/kaffe.in: Removed kjc.jar from bootclasspath.

* libraries/javalib/Makefile.am.in (toolsjar_DATA): Removed.

* configure.ac: Use jikes by default. Abort if no compiler found.

Members: 
	ChangeLog:1.3417->1.3418 
	Makefile.am:1.83->1.84 
	Makefile.in:1.193->1.194 
	configure:1.411->1.412 
	configure.ac:1.102->1.103 
	FAQ/FAQ.classlibrary-compile:1.15->1.16 
	kaffe/scripts/kaffe.in:1.33->1.34 
	libraries/javalib/Makefile.am:1.294->1.295 
	libraries/javalib/Makefile.am.in:1.31->1.32 
	libraries/javalib/Makefile.in:1.376->1.377 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3417 kaffe/ChangeLog:1.3418
--- kaffe/ChangeLog:1.3417	Thu Jan 20 19:39:10 2005
+++ kaffe/ChangeLog	Thu Jan 20 20:56:23 2005
@@ -1,5 +1,19 @@
 2005-01-20  Dalibor Topic  <robilad at kaffe.org>
 
+	* FAQ/FAQ.classlibrary-compile: Changed recommended version of jikes 
+	to jikes 1.21.
+
+	* Makefile.am (BUILD_ENVIRONMENT-make): Remove kjc.jar from 
+	BOOTCLASSPATH.
+
+	* kaffe/scripts/kaffe.in: Removed kjc.jar from bootclasspath.
+
+	* libraries/javalib/Makefile.am.in (toolsjar_DATA): Removed.
+
+	* configure.ac: Use jikes by default. Abort if no compiler found.
+
+2005-01-20  Dalibor Topic  <robilad at kaffe.org>
+
 	* THIRDPARTY (kjc): Removed section.
 
 2005-01-20  Dalibor Topic  <robilad at kaffe.org>
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.83 kaffe/Makefile.am:1.84
--- kaffe/Makefile.am:1.83	Mon Jan 10 20:08:08 2005
+++ kaffe/Makefile.am	Thu Jan 20 20:56:25 2005
@@ -136,7 +136,7 @@
 
 BUILD_ENVIRONMENT-make: Makefile
 	echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
-	echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | 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)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
 	echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
 	echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.193 kaffe/Makefile.in:1.194
--- kaffe/Makefile.in:1.193	Mon Jan 10 20:08:08 2005
+++ kaffe/Makefile.in	Thu Jan 20 20:56:25 2005
@@ -972,7 +972,7 @@
 
 BUILD_ENVIRONMENT-make: Makefile
 	echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
-	echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | 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)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
 	echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
 	echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
Index: kaffe/configure
diff -u kaffe/configure:1.411 kaffe/configure:1.412
--- kaffe/configure:1.411	Thu Jan 13 08:50:52 2005
+++ kaffe/configure	Thu Jan 20 20:56:26 2005
@@ -1127,7 +1127,7 @@
                           [default=unix-pthreads]
   --with-gc=GC            Force use given execution engine (kaffe-gc or
                           boehm-gc)
-  --with-jikes<=JIKES>    Define to use jikes compiler [default=no]. If
+  --with-jikes<=JIKES>    Define to use jikes compiler [default=yes]. If
                           yes, use jikes +Pno-switchcheck +Pno-shadow +E
   --with-libffi           Use libffi for sysdepCallMethod
   --without-gmp           don't use GNU multiple precision arithmetic library
@@ -28589,7 +28589,7 @@
   withval="$with_jikes"
   JIKES="$withval"
 else
-  JIKES=""
+  with_jikes="yes"
 fi;
 
 echo "$as_me:$LINENO: checking whether to use jikes" >&5
@@ -28597,12 +28597,19 @@
 
 case $with_jikes in
 yes)
+	if test x"$JIKESPROG" == x"" ; then
+	  { { echo "$as_me:$LINENO: error: No jikes compiler found. It is required to build Kaffe's class library. Recommended is jikes version 1.21 or higher." >&5
+echo "$as_me: error: No jikes compiler found. It is required to build Kaffe's class library. Recommended is jikes version 1.21 or higher." >&2;}
+   { (exit 1); exit 1; }; }
+	fi
 	JIKES="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
 	use_jikes="yes ($JIKES)"
 	;;
 no)
 	use_jikes="no"
-	JIKES=
+	{ { echo "$as_me:$LINENO: error: You have to use jikes 1.21 or higher to build kaffe's class library, or to pass a different external java compiler to configure script." >&5
+echo "$as_me: error: You have to use jikes 1.21 or higher to build kaffe's class library, or to pass a different external java compiler to configure script." >&2;}
+   { (exit 1); exit 1; }; }
 	;;
 *)
 	JIKES="$with_jikes"
@@ -58240,7 +58247,7 @@
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 58243: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 58250: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -58358,7 +58365,7 @@
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 58361 "configure" */
+/* #line 58368 "configure" */
 public class Test {
 }
 EOF
@@ -58395,7 +58402,7 @@
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 58398 "configure" */
+/* [#]line 58405 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.102 kaffe/configure.ac:1.103
--- kaffe/configure.ac:1.102	Thu Jan 13 08:50:59 2005
+++ kaffe/configure.ac	Thu Jan 20 20:56:33 2005
@@ -698,26 +698,29 @@
 )
 
 dnl =========================================================================
-dnl Use jikes instead of kjc?
+dnl Use jikes
 dnl =========================================================================
 
 AC_CHECK_PROG(JIKESPROG, jikes, jikes)
 AC_ARG_WITH([jikes],
             AS_HELP_STRING([--with-jikes<=JIKES>],
-                           [Define to use jikes compiler @<:@default=no@:>@.  If yes, use jikes +Pno-switchcheck +Pno-shadow +E]),
+                           [Define to use jikes compiler @<:@default=yes@:>@.  If yes, use jikes +Pno-switchcheck +Pno-shadow +E]),
 	[JIKES="$withval"],
-	[JIKES=""])
+	[with_jikes="yes"])
 
 AC_MSG_CHECKING([whether to use jikes])
 
 case $with_jikes in
 yes)
+	if test x"$JIKESPROG" == x"" ; then
+	  AC_MSG_ERROR([No jikes compiler found. It is required to build Kaffe's class library. Recommended is jikes version 1.21 or higher.])
+	fi
 	JIKES="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
 	use_jikes="yes ($JIKES)"
 	;;
 no)
 	use_jikes="no"
-	JIKES=
+	AC_MSG_ERROR([You have to use jikes 1.21 or higher to build kaffe's class library, or to pass a different external java compiler to configure script.])
 	;;
 *)
 	JIKES="$with_jikes"
Index: kaffe/FAQ/FAQ.classlibrary-compile
diff -u kaffe/FAQ/FAQ.classlibrary-compile:1.15 kaffe/FAQ/FAQ.classlibrary-compile:1.16
--- kaffe/FAQ/FAQ.classlibrary-compile:1.15	Sun Jul 18 15:27:36 2004
+++ kaffe/FAQ/FAQ.classlibrary-compile	Thu Jan 20 20:56:34 2005
@@ -70,7 +70,7 @@
 Please note that jikes 1.14 and 1.15 have bugs that result in a
 miscompiled Klasses.jar file.
 
-The recommended version of jikes is 1.18.
+The recommended version of jikes is 1.21 or higher.
 
 * kjc
 
Index: kaffe/kaffe/scripts/kaffe.in
diff -u kaffe/kaffe/scripts/kaffe.in:1.33 kaffe/kaffe/scripts/kaffe.in:1.34
--- kaffe/kaffe/scripts/kaffe.in:1.33	Wed Apr 14 19:40:05 2004
+++ kaffe/kaffe/scripts/kaffe.in	Thu Jan 20 20:56:34 2005
@@ -16,8 +16,7 @@
 #	1. a user-specified CLASSPATH or .
 #	2. Klasses.jar in $datadir/kaffe
 #       3. Kaffe extensions jar files in $datadir/kaffe
-#	4. kjc.jar in $datadir/kaffe
-#	5. classes.zip in $datadir/kaffe iff it exists.
+#	4. classes.zip in $datadir/kaffe iff it exists.
 #
 # Note that as the last thing we slurp in the files $datadir/kafferc
 # and $HOME/.kafferc (in that order) if they exist. This allows site
@@ -63,7 +62,7 @@
 if test x"${BOOTCLASSPATH+set}"x != x"set"x ; then
 	BOOTCLASSPATH=
 fi
-for f in rt.jar comm.jar pjava.jar servlet.jar tools.jar microsoft.jar kjc.jar rmi.jar; do
+for f in rt.jar comm.jar pjava.jar servlet.jar tools.jar microsoft.jar rmi.jar; do
   if test -f "$KAFFE_LIBDIR/$f"; then
     BOOTCLASSPATH="$BOOTCLASSPATH$PATHSEP$KAFFE_LIBDIR/$f"
   fi
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.294 kaffe/libraries/javalib/Makefile.am:1.295
--- kaffe/libraries/javalib/Makefile.am:1.294	Thu Jan 13 11:16:34 2005
+++ kaffe/libraries/javalib/Makefile.am	Thu Jan 20 20:56:35 2005
@@ -4,7 +4,7 @@
 # Copyright (c) 1997, 1998, 1999
 #      Transvirtual Technologies, Inc.  All rights reserved.
 #
-# Copyright (c) 2002, 2003
+# Copyright (c) 2002, 2003, 2005
 #      Kaffe.org contributors.
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -52,8 +52,6 @@
 	rt.jar \
 	logging.properties
 
-toolslib_DATA = kjc.jar
-
 Klasses_jar_SRCS = \
 	$(com_jcraft_jzlib_SRCS) \
 	$(gnu_classpath_SRCS) \
@@ -3028,12 +3026,15 @@
 	javax/imageio/event/IIOWriteProgressListener.java \
 	javax/imageio/event/IIOWriteWarningListener.java
 javax_imageio_metadata_SRCS = \
+	javax/imageio/metadata/IIOAttr.java \
 	javax/imageio/metadata/IIOInvalidTreeException.java \
 	javax/imageio/metadata/IIOMetadata.java \
 	javax/imageio/metadata/IIOMetadataController.java \
 	javax/imageio/metadata/IIOMetadataFormat.java \
 	javax/imageio/metadata/IIOMetadataFormatImpl.java \
-	javax/imageio/metadata/IIOMetadataNode.java
+	javax/imageio/metadata/IIOMetadataNode.java \
+	javax/imageio/metadata/IIONamedNodeMap.java \
+	javax/imageio/metadata/IIONodeList.java
 javax_imageio_spi_SRCS = \
 	javax/imageio/spi/IIORegistry.java \
 	javax/imageio/spi/IIOServiceProvider.java \
@@ -3231,6 +3232,7 @@
 	javax/print/attribute/URISyntax.java \
 	javax/print/attribute/UnmodifiableSetException.java
 javax_print_attribute_standard_SRCS = \
+	javax/print/attribute/standard/Chromaticity.java \
 	javax/print/attribute/standard/ColorSupported.java \
 	javax/print/attribute/standard/Compression.java \
 	javax/print/attribute/standard/Copies.java \
@@ -3238,6 +3240,7 @@
 	javax/print/attribute/standard/DateTimeAtCompleted.java \
 	javax/print/attribute/standard/DateTimeAtCreation.java \
 	javax/print/attribute/standard/DateTimeAtProcessing.java \
+	javax/print/attribute/standard/Destination.java \
 	javax/print/attribute/standard/DocumentName.java \
 	javax/print/attribute/standard/Fidelity.java \
 	javax/print/attribute/standard/Finishings.java \
@@ -3777,6 +3780,7 @@
 	javax/swing/text/Position.java \
 	javax/swing/text/Segment.java \
 	javax/swing/text/SimpleAttributeSet.java \
+	javax/swing/text/StringContent.java \
 	javax/swing/text/Style.java \
 	javax/swing/text/StyleConstants.java \
 	javax/swing/text/StyleContext.java \
@@ -4736,7 +4740,6 @@
 EXTRA_DIST = \
 	Makefile.am.in \
 	Klasses.jar.bootstrap \
-        $(toolslib_DATA) \
 	META-INF \
 	com \
 	gnu \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.31 kaffe/libraries/javalib/Makefile.am.in:1.32
--- kaffe/libraries/javalib/Makefile.am.in:1.31	Mon Jan 10 07:14:42 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Thu Jan 20 20:56:36 2005
@@ -4,7 +4,7 @@
 # Copyright (c) 1997, 1998, 1999
 #      Transvirtual Technologies, Inc.  All rights reserved.
 #
-# Copyright (c) 2002, 2003
+# Copyright (c) 2002, 2003, 2005
 #      Kaffe.org contributors.
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -52,8 +52,6 @@
 	rt.jar \
 	logging.properties
 
-toolslib_DATA = kjc.jar
-
 Klasses_jar_SRCS = \
 	# The following will be replaced by the
 	# developers/update-class-list script with a
@@ -164,7 +162,6 @@
 EXTRA_DIST = \
 	Makefile.am.in \
 	Klasses.jar.bootstrap \
-        $(toolslib_DATA) \
 	META-INF \
 	com \
 	gnu \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.376 kaffe/libraries/javalib/Makefile.in:1.377
--- kaffe/libraries/javalib/Makefile.in:1.376	Thu Jan 13 11:16:35 2005
+++ kaffe/libraries/javalib/Makefile.in	Thu Jan 20 20:56:36 2005
@@ -20,7 +20,7 @@
 # Copyright (c) 1997, 1998, 1999
 #      Transvirtual Technologies, Inc.  All rights reserved.
 #
-# Copyright (c) 2002, 2003
+# Copyright (c) 2002, 2003, 2005
 #      Kaffe.org contributors.
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -106,10 +106,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(jrelibdir)" "$(DESTDIR)$(toolslibdir)"
+am__installdirs = "$(DESTDIR)$(jrelibdir)"
 jrelibDATA_INSTALL = $(INSTALL_DATA)
-toolslibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(jrelib_DATA) $(toolslib_DATA)
+DATA = $(jrelib_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = . awt-implementations gmp-math
@@ -403,7 +402,6 @@
 	rt.jar \
 	logging.properties
 
-toolslib_DATA = kjc.jar
 Klasses_jar_SRCS = \
 	$(com_jcraft_jzlib_SRCS) \
 	$(gnu_classpath_SRCS) \
@@ -3544,12 +3542,15 @@
 	javax/imageio/event/IIOWriteWarningListener.java
 
 javax_imageio_metadata_SRCS = \
+	javax/imageio/metadata/IIOAttr.java \
 	javax/imageio/metadata/IIOInvalidTreeException.java \
 	javax/imageio/metadata/IIOMetadata.java \
 	javax/imageio/metadata/IIOMetadataController.java \
 	javax/imageio/metadata/IIOMetadataFormat.java \
 	javax/imageio/metadata/IIOMetadataFormatImpl.java \
-	javax/imageio/metadata/IIOMetadataNode.java
+	javax/imageio/metadata/IIOMetadataNode.java \
+	javax/imageio/metadata/IIONamedNodeMap.java \
+	javax/imageio/metadata/IIONodeList.java
 
 javax_imageio_spi_SRCS = \
 	javax/imageio/spi/IIORegistry.java \
@@ -3759,6 +3760,7 @@
 	javax/print/attribute/UnmodifiableSetException.java
 
 javax_print_attribute_standard_SRCS = \
+	javax/print/attribute/standard/Chromaticity.java \
 	javax/print/attribute/standard/ColorSupported.java \
 	javax/print/attribute/standard/Compression.java \
 	javax/print/attribute/standard/Copies.java \
@@ -3766,6 +3768,7 @@
 	javax/print/attribute/standard/DateTimeAtCompleted.java \
 	javax/print/attribute/standard/DateTimeAtCreation.java \
 	javax/print/attribute/standard/DateTimeAtProcessing.java \
+	javax/print/attribute/standard/Destination.java \
 	javax/print/attribute/standard/DocumentName.java \
 	javax/print/attribute/standard/Fidelity.java \
 	javax/print/attribute/standard/Finishings.java \
@@ -4330,6 +4333,7 @@
 	javax/swing/text/Position.java \
 	javax/swing/text/Segment.java \
 	javax/swing/text/SimpleAttributeSet.java \
+	javax/swing/text/StringContent.java \
 	javax/swing/text/Style.java \
 	javax/swing/text/StyleConstants.java \
 	javax/swing/text/StyleContext.java \
@@ -5358,7 +5362,6 @@
 EXTRA_DIST = \
 	Makefile.am.in \
 	Klasses.jar.bootstrap \
-        $(toolslib_DATA) \
 	META-INF \
 	com \
 	gnu \
@@ -5448,23 +5451,6 @@
 	  echo " rm -f '$(DESTDIR)$(jrelibdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(jrelibdir)/$$f"; \
 	done
-install-toolslibDATA: $(toolslib_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(toolslibdir)" || $(mkdir_p) "$(DESTDIR)$(toolslibdir)"
-	@list='$(toolslib_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(toolslibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(toolslibdir)/$$f'"; \
-	  $(toolslibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(toolslibdir)/$$f"; \
-	done
-
-uninstall-toolslibDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(toolslib_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(toolslibdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(toolslibdir)/$$f"; \
-	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -5637,7 +5623,7 @@
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(jrelibdir)" "$(DESTDIR)$(toolslibdir)"; do \
+	for dir in "$(DESTDIR)$(jrelibdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -5683,7 +5669,7 @@
 
 info-am:
 
-install-data-am: install-jrelibDATA install-toolslibDATA
+install-data-am: install-jrelibDATA
 
 install-exec-am:
 
@@ -5709,8 +5695,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-jrelibDATA \
-	uninstall-toolslibDATA
+uninstall-am: uninstall-info-am uninstall-jrelibDATA
 
 uninstall-info: uninstall-info-recursive
 
@@ -5721,13 +5706,12 @@
 	dvi dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-exec install-exec-am \
 	install-info install-info-am install-jrelibDATA install-man \
-	install-strip install-toolslibDATA installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am uninstall-jrelibDATA \
-	uninstall-toolslibDATA
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	uninstall-jrelibDATA
 
 
 dist-hook:

More information about the kaffe mailing list