[kaffe] CVS kaffe (robilad): Reworked the build system to remove klasses.jar.bootstrap, and simplify the kaff

Kaffe CVS cvs-commits at kaffe.org
Sun Jan 23 10:54:04 PST 2005 

PatchSet 5908 
Date: 2005/01/23 18:48:33
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Reworked the build system to remove klasses.jar.bootstrap, and simplify the kaffeh step

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

* libraries/javalib/Klasses.jar.bootstrap: Removed.

* Makefile.am (SUBDIRS): reworked the build system to build the
class library first, then kaffeh, and then the rest of kaffe.
(kaffe-build-order, all-local, install-exec-hook,
install-data-hook, uninstall-hook, clean-local) Removed.

* include/Makefile.am (KLASSES_JAR): Use rt.jar instead of
Klasses.jar.bootstrap.
(NOINSTALL_JNI_DERIVED_HDRS) Added LIBTRITONUSALSA_JNI_HDRS,
LIBTRITONUSESD_JNI_HDRS, LIBXMLJ_JNI_HDRS and LIBGTKPEER_JNI_HDRS.
(libtritonusalsa_headers, stamp-libtritonusalsa,
libtritonusesd_headers, stamp-libtritonusesd,
libxmlj_headers, stamp-libxmlj, libgtkpeer_headers,
stamp-libgtkpeer) Removed.
(CLEANFILES) Removed LIBTRITONUSALSA_JNI_HDRS,
LIBTRITONUSESD_JNI_HDRS and LIBXMLJ_JNI_HDRS.

* kaffe/kaffe/Makefile.am (final-executable): Removed.

* libraries/clib/Makefile.am (SUBDIRS): Added libxmlj.
(DIST_SUBDIRS) Removed.
Added coditional build for libxmlj.

* libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
(libgtkpeer_headers): Removed.

* libraries/clib/libxmlj/Makefile.am (libxmlj_headers): Removed.

* libraries/clib/sound/alsa/Makefile.am (libtritonusalsa_headers):
Removed.

* libraries/clib/sound/esd/Makefile.am (libtritonusesd_headers):
Removed.

* Makefile.in,
include/Makefile.in,
kaffe/kaffe/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
libraries/clib/libxmlj/Makefile.in,
libraries/clib/sound/alsa/Makefile.in,
libraries/clib/sound/esd/Makefile.in,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.

Members: 
	ChangeLog:1.3447->1.3448 
	Makefile.am:1.85->1.86 
	Makefile.in:1.195->1.196 
	include/Makefile.am:1.85->1.86 
	include/Makefile.in:1.205->1.206 
	kaffe/kaffe/Makefile.am:1.28->1.29 
	kaffe/kaffe/Makefile.in:1.155->1.156 
	libraries/clib/Makefile.am:1.12->1.13 
	libraries/clib/Makefile.in:1.131->1.132 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.10->1.11 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.20->1.21 
	libraries/clib/libxmlj/Makefile.am:1.5->1.6 
	libraries/clib/libxmlj/Makefile.in:1.32->1.33 
	libraries/clib/sound/alsa/Makefile.am:1.3->1.4 
	libraries/clib/sound/alsa/Makefile.in:1.29->1.30 
	libraries/clib/sound/esd/Makefile.am:1.3->1.4 
	libraries/clib/sound/esd/Makefile.in:1.29->1.30 
	libraries/javalib/Klasses.jar.bootstrap:1.84->1.85(DEAD) 
	libraries/javalib/Makefile.am:1.295->1.296 
	libraries/javalib/Makefile.in:1.377->1.378 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3447 kaffe/ChangeLog:1.3448
--- kaffe/ChangeLog:1.3447	Sat Jan 22 19:20:47 2005
+++ kaffe/ChangeLog	Sun Jan 23 18:48:33 2005
@@ -1,5 +1,54 @@
 2005-01-22  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/Klasses.jar.bootstrap: Removed.
+	
+	* Makefile.am (SUBDIRS): reworked the build system to build the 
+	class library first, then kaffeh, and then the rest of kaffe.
+	(kaffe-build-order, all-local, install-exec-hook,
+	install-data-hook, uninstall-hook, clean-local) Removed.
+
+	* include/Makefile.am (KLASSES_JAR): Use rt.jar instead of 
+	Klasses.jar.bootstrap.
+	(NOINSTALL_JNI_DERIVED_HDRS) Added LIBTRITONUSALSA_JNI_HDRS, 
+	LIBTRITONUSESD_JNI_HDRS, LIBXMLJ_JNI_HDRS and LIBGTKPEER_JNI_HDRS.
+	(libtritonusalsa_headers, stamp-libtritonusalsa,
+	libtritonusesd_headers, stamp-libtritonusesd,
+	libxmlj_headers, stamp-libxmlj, libgtkpeer_headers,
+	stamp-libgtkpeer) Removed.
+	(CLEANFILES) Removed LIBTRITONUSALSA_JNI_HDRS, 
+	LIBTRITONUSESD_JNI_HDRS and LIBXMLJ_JNI_HDRS.
+
+	* kaffe/kaffe/Makefile.am (final-executable): Removed.
+
+	* libraries/clib/Makefile.am (SUBDIRS): Added libxmlj.
+	(DIST_SUBDIRS) Removed.
+	Added coditional build for libxmlj.
+
+	* libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
+	(libgtkpeer_headers): Removed.
+
+	* libraries/clib/libxmlj/Makefile.am (libxmlj_headers): Removed.
+
+	* libraries/clib/sound/alsa/Makefile.am (libtritonusalsa_headers):
+	Removed.
+
+	* libraries/clib/sound/esd/Makefile.am (libtritonusesd_headers):
+	Removed.
+	
+	* Makefile.in, 
+	include/Makefile.in,
+	kaffe/kaffe/Makefile.in,
+	libraries/clib/Makefile.in,
+	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
+	libraries/clib/libxmlj/Makefile.in,
+	libraries/clib/sound/alsa/Makefile.in,
+	libraries/clib/sound/esd/Makefile.in,
+	libraries/javalib/Makefile.am,
+	libraries/javalib/Makefile.in:
+	Regenerated.
+	
+2005-01-22  Dalibor Topic  <robilad at kaffe.org>
+	
 	Resynced with GNU Classpath.
 	
 	2005-01-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.85 kaffe/Makefile.am:1.86
--- kaffe/Makefile.am:1.85	Thu Jan 20 21:38:09 2005
+++ kaffe/Makefile.am	Sun Jan 23 18:48:36 2005
@@ -14,7 +14,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.3e
 
-SUBDIRS = . po
+# binreloc seems a bit painful to integrate, it may be unnecessary
+# if we get turn the shared native libraries into convenience
+# libraries.
+#if ENABLE_BINRELOC
+#MAYBE_BINRELOC_DIR = binreloc
+#endif
+
+SUBDIRS = . libraries/javalib config libltdl replace $(MAYBE_BINRELOC_DIR) kaffe/kaffeh include  kaffe/kaffevm libraries/clib kaffe po tools
 DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po
 
 EXTRA_DIST = \
@@ -225,34 +232,6 @@
 DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/classpath-gtk
 endif
 endif
-
-
-.PHONY: kaffe-build-order
-
-kaffe-build-order:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
-	done; \
-	(cd libraries/javalib && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
-	done ;
-
-all-local: KAFFE_BUILD_TARGET = all
-all-local: kaffe-build-order
-	cd kaffe/kaffe && $(MAKE) final-executable
-
-install-exec-hook: KAFFE_BUILD_TARGET = install-exec
-install-exec-hook: kaffe-build-order
-
-install-data-hook: KAFFE_BUILD_TARGET = install-data
-install-data-hook: kaffe-build-order
-
-uninstall-hook: KAFFE_BUILD_TARGET = uninstall
-uninstall-hook: kaffe-build-order
-
-clean-local: KAFFE_BUILD_TARGET = clean
-clean-local: kaffe-build-order
 
 check-local:
 	cd test && $(MAKE) check
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.195 kaffe/Makefile.in:1.196
--- kaffe/Makefile.in:1.195	Thu Jan 20 21:38:11 2005
+++ kaffe/Makefile.in	Sun Jan 23 18:48:36 2005
@@ -389,7 +389,14 @@
 with_engine = @with_engine@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign 1.3e
-SUBDIRS = . po
+
+# binreloc seems a bit painful to integrate, it may be unnecessary
+# if we get turn the shared native libraries into convenience
+# libraries.
+#if ENABLE_BINRELOC
+#MAYBE_BINRELOC_DIR = binreloc
+#endif
+SUBDIRS = . libraries/javalib config libltdl replace $(MAYBE_BINRELOC_DIR) kaffe/kaffeh include  kaffe/kaffevm libraries/clib kaffe po tools
 DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po
 EXTRA_DIST = \
 	ChangeLog.1 \
@@ -854,7 +861,7 @@
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
-all-am: Makefile $(SCRIPTS) all-local
+all-am: Makefile $(SCRIPTS)
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -884,7 +891,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -903,12 +910,8 @@
 info-am:
 
 install-data-am:
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am:
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-recursive
 
@@ -935,28 +938,23 @@
 ps-am:
 
 uninstall-am: uninstall-info-am
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
-	am--refresh check check-am check-local clean clean-generic \
-	clean-libtool clean-local clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am check-local clean clean-generic clean-libtool \
+	clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-generic distclean-hdr distclean-libtool \
 	distclean-recursive distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am \
-	install-exec-hook install-info install-info-am install-man \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	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-hook \
-	uninstall-info-am
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 
 depend:
@@ -1008,33 +1006,6 @@
 # Regenerate HTML docs and copy them to source tree
 docs-regen: docs-docbook-html
 	cp -f target/docs/docbook/*.html $(srcdir)/docs/html
-
-.PHONY: kaffe-build-order
-
-kaffe-build-order:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
-	done; \
-	(cd libraries/javalib && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
-	done ;
-
-all-local: KAFFE_BUILD_TARGET = all
-all-local: kaffe-build-order
-	cd kaffe/kaffe && $(MAKE) final-executable
-
-install-exec-hook: KAFFE_BUILD_TARGET = install-exec
-install-exec-hook: kaffe-build-order
-
-install-data-hook: KAFFE_BUILD_TARGET = install-data
-install-data-hook: kaffe-build-order
-
-uninstall-hook: KAFFE_BUILD_TARGET = uninstall
-uninstall-hook: kaffe-build-order
-
-clean-local: KAFFE_BUILD_TARGET = clean
-clean-local: kaffe-build-order
 
 check-local:
 	cd test && $(MAKE) check
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.85 kaffe/include/Makefile.am:1.86
--- kaffe/include/Makefile.am:1.85	Thu Jan 13 11:16:33 2005
+++ kaffe/include/Makefile.am	Sun Jan 23 18:48:37 2005
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-KLASSES_JAR = $(top_srcdir)/libraries/javalib/Klasses.jar.bootstrap
+KLASSES_JAR = $(top_builddir)/libraries/javalib/rt.jar
 
 EXTRA_DIST = distclean-hack \
 		stamp-h2.in
@@ -20,17 +20,12 @@
 # _DERIVED_ means: these headers are derived (using
 # kaffeh, from Klasses.jar.bootstrap). 
 # _JNI_DERIVED_ means: these headers are derived using kaffeh
-# from Klasses.jar.bootstrap *and* the -jni option is
+# from rt.jar *and* the -jni option is
 # set, resulting in JNI-ish method names.
 #
 # So if your class uses JNI to call its native methods
 # (like tritonus), then it goes into the JNI set,
 # otherwise it goes into the other one.
-#
-# In libraries/javalib, Klasses.jar.bootstrap contains
-# beside classes necesary for kjc to run, also all the
-# classes necessary to generate headers from. They are
-# at the end of bootstrap.classlist.
 
 INSTALL_DERIVED_HDRS = 
 
@@ -104,33 +99,6 @@
 
 INSTALL_JNI_DERIVED_HDRS =
 
-NOINSTALL_JNI_DERIVED_HDRS = \
-	java_math_BigInteger.h \
-	gnu_classpath_VMSystemProperties.h \
-	gnu_java_nio_channels_FileChannelImpl.h \
-	gnu_java_nio_SelectorImpl.h \
-	java_io_ObjectInputStream.h \
-	java_io_VMObjectStreamClass.h \
-	java_nio_VMDirectByteBuffer.h \
-	java_nio_MappedByteBufferImpl.h \
-	kaffe_io_ByteToCharDefault.h \
-	kaffe_io_ByteToCharIconv.h \
-	kaffe_io_CharToByteDefault.h \
-	kaffe_io_CharToByteIconv.h \
-	kaffe_lang_MemoryAdvice.h \
-	kaffe_lang_UNIXProcess.h \
-	kaffe_management_JIT.h \
-	kaffe_management_Debug.h \
-	kaffe_management_XProfiler.h \
-	kaffe_security_provider_MD2.h \
-	kaffe_security_provider_MD4.h \
-	kaffe_security_provider_MD5.h \
-	kaffe_security_provider_SHA.h
-
-
-JNI_DERIVED_HDRS = $(INSTALL_JNI_DERIVED_HDRS) $(NOINSTALL_JNI_DERIVED_HDRS)
-
-
 LIBTRITONUSALSA_JNI_HDRS = \
 	org_tritonus_lowlevel_alsa_AlsaCtlCardInfo.h \
 	org_tritonus_lowlevel_alsa_AlsaCtl.h \
@@ -223,6 +191,37 @@
 	gnu_java_awt_peer_gtk_GtkWindowPeer.h \
 	gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
 
+NOINSTALL_JNI_DERIVED_HDRS = \
+	java_math_BigInteger.h \
+	gnu_classpath_VMSystemProperties.h \
+	gnu_java_nio_channels_FileChannelImpl.h \
+	gnu_java_nio_SelectorImpl.h \
+	java_io_ObjectInputStream.h \
+	java_io_VMObjectStreamClass.h \
+	java_nio_VMDirectByteBuffer.h \
+	java_nio_MappedByteBufferImpl.h \
+	kaffe_io_ByteToCharDefault.h \
+	kaffe_io_ByteToCharIconv.h \
+	kaffe_io_CharToByteDefault.h \
+	kaffe_io_CharToByteIconv.h \
+	kaffe_lang_MemoryAdvice.h \
+	kaffe_lang_UNIXProcess.h \
+	kaffe_management_JIT.h \
+	kaffe_management_Debug.h \
+	kaffe_management_XProfiler.h \
+	kaffe_security_provider_MD2.h \
+	kaffe_security_provider_MD4.h \
+	kaffe_security_provider_MD5.h \
+	kaffe_security_provider_SHA.h \
+	$(LIBTRITONUSALSA_JNI_HDRS) \
+	$(LIBTRITONUSESD_JNI_HDRS) \
+	$(LIBXMLJ_JNI_HDRS) \
+	$(LIBGTKPEER_JNI_HDRS)
+
+JNI_DERIVED_HDRS = \
+	$(INSTALL_JNI_DERIVED_HDRS) \
+	$(NOINSTALL_JNI_DERIVED_HDRS)
+
 if USE_COMPAT_IFADDRS
 ifaddrs_compat = ifaddrs.h
 
@@ -331,73 +330,9 @@
 stamp-h1all: rebuild-jni-hdrs
 	@echo timestamp > $@
 
-#
-# header files for alsa backend of tritonus
-#
-.PHONY:libtritonusalsa_headers
-libtritonusalsa_headers: $(LIBTRITONUSALSA_JNI_HDRS)
-
-$(LIBTRITONUSALSA_JNI_HDRS): stamp-libtritonusalsa
-	@if test -f $@; then :; else \
-	  rm -f stamp-libtritonusalsa; $(MAKE) stamp-libtritonusalsa; \
-	fi
-
-stamp-libtritonusalsa: HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
-stamp-libtritonusalsa: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for esd backend of tritonus
-#
-.PHONY:libtritonusesd_headers
-libtritonusesd_headers: $(LIBTRITONUSESD_JNI_HDRS)
-
-$(LIBTRITONUSESD_JNI_HDRS): stamp-libtritonusesd
-	@if test -f $@; then :; else \
-	  rm -f stamp-libtritonusesd; $(MAKE) stamp-libtritonusesd; \
-	fi
-
-stamp-libtritonusesd: HDRS = $(LIBTRITONUSESD_JNI_HDRS)
-stamp-libtritonusesd: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for libxmlj
-#
-.PHONY:libxmlj_headers
-libxmlj_headers: $(LIBXMLJ_JNI_HDRS)
-
-$(LIBXMLJ_JNI_HDRS): stamp-libxmlj
-	@if test -f $@; then :; else \
-	  rm -f stamp-libxmlj; $(MAKE) stamp-libxmlj; \
-	fi
-
-stamp-libxmlj: HDRS = $(LIBXMLJ_JNI_HDRS)
-stamp-libxmlj: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for classpath's gtk awt backend
-#
-.PHONY:libgtkpeer_headers
-libgtkpeer_headers: $(LIBGTKPEER_JNI_HDRS)
-
-$(LIBGTKPEER_JNI_HDRS): stamp-libgtkpeer
-	@if test -f $@; then :; else \
-	  rm -f stamp-libgtkpeer; $(MAKE) stamp-libgtkpeer; \
-	fi
-
-stamp-libgtkpeer: HDRS = $(LIBGTKPEER_JNI_HDRS)
-stamp-libgtkpeer: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-
 CLEANFILES = \
 	$(DERIVED_HDRS) \
 	$(JNI_DERIVED_HDRS) \
-	$(LIBTRITONUSALSA_JNI_HDRS) \
-	$(LIBTRITONUSESD_JNI_HDRS) \
-	$(LIBXMLJ_JNI_HDRS) \
 	stamp-kaffeh
 
 DISTCLEANFILES = \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.205 kaffe/include/Makefile.in:1.206
--- kaffe/include/Makefile.in:1.205	Thu Jan 13 11:16:33 2005
+++ kaffe/include/Makefile.in	Sun Jan 23 18:48:37 2005
@@ -372,7 +372,7 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-KLASSES_JAR = $(top_srcdir)/libraries/javalib/Klasses.jar.bootstrap
+KLASSES_JAR = $(top_builddir)/libraries/javalib/rt.jar
 EXTRA_DIST = distclean-hack \
 		stamp-h2.in
 
@@ -382,17 +382,12 @@
 # _DERIVED_ means: these headers are derived (using
 # kaffeh, from Klasses.jar.bootstrap). 
 # _JNI_DERIVED_ means: these headers are derived using kaffeh
-# from Klasses.jar.bootstrap *and* the -jni option is
+# from rt.jar *and* the -jni option is
 # set, resulting in JNI-ish method names.
 #
 # So if your class uses JNI to call its native methods
 # (like tritonus), then it goes into the JNI set,
 # otherwise it goes into the other one.
-#
-# In libraries/javalib, Klasses.jar.bootstrap contains
-# beside classes necesary for kjc to run, also all the
-# classes necessary to generate headers from. They are
-# at the end of bootstrap.classlist.
 INSTALL_DERIVED_HDRS = 
 NOINSTALL_DERIVED_HDRS = \
 	java_lang_Object.h \
@@ -461,30 +456,6 @@
 
 DERIVED_HDRS = $(INSTALL_DERIVED_HDRS) $(NOINSTALL_DERIVED_HDRS)
 INSTALL_JNI_DERIVED_HDRS = 
-NOINSTALL_JNI_DERIVED_HDRS = \
-	java_math_BigInteger.h \
-	gnu_classpath_VMSystemProperties.h \
-	gnu_java_nio_channels_FileChannelImpl.h \
-	gnu_java_nio_SelectorImpl.h \
-	java_io_ObjectInputStream.h \
-	java_io_VMObjectStreamClass.h \
-	java_nio_VMDirectByteBuffer.h \
-	java_nio_MappedByteBufferImpl.h \
-	kaffe_io_ByteToCharDefault.h \
-	kaffe_io_ByteToCharIconv.h \
-	kaffe_io_CharToByteDefault.h \
-	kaffe_io_CharToByteIconv.h \
-	kaffe_lang_MemoryAdvice.h \
-	kaffe_lang_UNIXProcess.h \
-	kaffe_management_JIT.h \
-	kaffe_management_Debug.h \
-	kaffe_management_XProfiler.h \
-	kaffe_security_provider_MD2.h \
-	kaffe_security_provider_MD4.h \
-	kaffe_security_provider_MD5.h \
-	kaffe_security_provider_SHA.h
-
-JNI_DERIVED_HDRS = $(INSTALL_JNI_DERIVED_HDRS) $(NOINSTALL_JNI_DERIVED_HDRS)
 LIBTRITONUSALSA_JNI_HDRS = \
 	org_tritonus_lowlevel_alsa_AlsaCtlCardInfo.h \
 	org_tritonus_lowlevel_alsa_AlsaCtl.h \
@@ -575,6 +546,37 @@
 	gnu_java_awt_peer_gtk_GtkWindowPeer.h \
 	gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
 
+NOINSTALL_JNI_DERIVED_HDRS = \
+	java_math_BigInteger.h \
+	gnu_classpath_VMSystemProperties.h \
+	gnu_java_nio_channels_FileChannelImpl.h \
+	gnu_java_nio_SelectorImpl.h \
+	java_io_ObjectInputStream.h \
+	java_io_VMObjectStreamClass.h \
+	java_nio_VMDirectByteBuffer.h \
+	java_nio_MappedByteBufferImpl.h \
+	kaffe_io_ByteToCharDefault.h \
+	kaffe_io_ByteToCharIconv.h \
+	kaffe_io_CharToByteDefault.h \
+	kaffe_io_CharToByteIconv.h \
+	kaffe_lang_MemoryAdvice.h \
+	kaffe_lang_UNIXProcess.h \
+	kaffe_management_JIT.h \
+	kaffe_management_Debug.h \
+	kaffe_management_XProfiler.h \
+	kaffe_security_provider_MD2.h \
+	kaffe_security_provider_MD4.h \
+	kaffe_security_provider_MD5.h \
+	kaffe_security_provider_SHA.h \
+	$(LIBTRITONUSALSA_JNI_HDRS) \
+	$(LIBTRITONUSESD_JNI_HDRS) \
+	$(LIBXMLJ_JNI_HDRS) \
+	$(LIBGTKPEER_JNI_HDRS)
+
+JNI_DERIVED_HDRS = \
+	$(INSTALL_JNI_DERIVED_HDRS) \
+	$(NOINSTALL_JNI_DERIVED_HDRS)
+
 @USE_COMPAT_IFADDRS_FALSE at ifaddrs_compat = #
 @USE_COMPAT_IFADDRS_TRUE at ifaddrs_compat = ifaddrs.h
 nodist_noinst_HEADERS = \
@@ -620,9 +622,6 @@
 CLEANFILES = \
 	$(DERIVED_HDRS) \
 	$(JNI_DERIVED_HDRS) \
-	$(LIBTRITONUSALSA_JNI_HDRS) \
-	$(LIBTRITONUSESD_JNI_HDRS) \
-	$(LIBXMLJ_JNI_HDRS) \
 	stamp-kaffeh
 
 DISTCLEANFILES = \
@@ -957,66 +956,6 @@
 
 stamp-h1all: HDRS = $(JNI_DERIVED_HDRS)
 stamp-h1all: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for alsa backend of tritonus
-#
-.PHONY:libtritonusalsa_headers
-libtritonusalsa_headers: $(LIBTRITONUSALSA_JNI_HDRS)
-
-$(LIBTRITONUSALSA_JNI_HDRS): stamp-libtritonusalsa
-	@if test -f $@; then :; else \
-	  rm -f stamp-libtritonusalsa; $(MAKE) stamp-libtritonusalsa; \
-	fi
-
-stamp-libtritonusalsa: HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
-stamp-libtritonusalsa: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for esd backend of tritonus
-#
-.PHONY:libtritonusesd_headers
-libtritonusesd_headers: $(LIBTRITONUSESD_JNI_HDRS)
-
-$(LIBTRITONUSESD_JNI_HDRS): stamp-libtritonusesd
-	@if test -f $@; then :; else \
-	  rm -f stamp-libtritonusesd; $(MAKE) stamp-libtritonusesd; \
-	fi
-
-stamp-libtritonusesd: HDRS = $(LIBTRITONUSESD_JNI_HDRS)
-stamp-libtritonusesd: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for libxmlj
-#
-.PHONY:libxmlj_headers
-libxmlj_headers: $(LIBXMLJ_JNI_HDRS)
-
-$(LIBXMLJ_JNI_HDRS): stamp-libxmlj
-	@if test -f $@; then :; else \
-	  rm -f stamp-libxmlj; $(MAKE) stamp-libxmlj; \
-	fi
-
-stamp-libxmlj: HDRS = $(LIBXMLJ_JNI_HDRS)
-stamp-libxmlj: rebuild-jni-hdrs
-	@echo timestamp > $@
-
-#
-# header files for classpath's gtk awt backend
-#
-.PHONY:libgtkpeer_headers
-libgtkpeer_headers: $(LIBGTKPEER_JNI_HDRS)
-
-$(LIBGTKPEER_JNI_HDRS): stamp-libgtkpeer
-	@if test -f $@; then :; else \
-	  rm -f stamp-libgtkpeer; $(MAKE) stamp-libgtkpeer; \
-	fi
-
-stamp-libgtkpeer: HDRS = $(LIBGTKPEER_JNI_HDRS)
-stamp-libgtkpeer: rebuild-jni-hdrs
 	@echo timestamp > $@
 
 dist-hook:
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.28 kaffe/kaffe/kaffe/Makefile.am:1.29
--- kaffe/kaffe/kaffe/Makefile.am:1.28	Sat Sep 18 20:48:16 2004
+++ kaffe/kaffe/kaffe/Makefile.am	Sun Jan 23 18:48:38 2005
@@ -75,14 +75,6 @@
 
 DISTCLEANFILES = version-info.h
 
-#
-# relink the kaffe binary including the optinal java libs
-#
-final-executable: 
-	@rm -f kaffe-bin$(EXEEXT)
-	@$(MAKE) kaffe-bin$(EXEEXT) kaffe_bin_LDADD="$(OPT_DLOPEN_JAVA_LIBS) $(kaffe_bin_LDADD)"
-
-
 dist-hook:
 	@for file in $(DISTCLEANFILES); do \
 	  rm -f $(distdir)/$$file; \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.155 kaffe/kaffe/kaffe/Makefile.in:1.156
--- kaffe/kaffe/kaffe/Makefile.in:1.155	Wed Dec 22 19:04:52 2004
+++ kaffe/kaffe/kaffe/Makefile.in	Sun Jan 23 18:48:38 2005
@@ -715,13 +715,6 @@
 	echo '#define VER_GARBAGE_COLLECTOR "$(GC_NAME)"'     >> $@T
 	-mv $@T $@
 
-#
-# relink the kaffe binary including the optinal java libs
-#
-final-executable: 
-	@rm -f kaffe-bin$(EXEEXT)
-	@$(MAKE) kaffe-bin$(EXEEXT) kaffe_bin_LDADD="$(OPT_DLOPEN_JAVA_LIBS) $(kaffe_bin_LDADD)"
-
 dist-hook:
 	@for file in $(DISTCLEANFILES); do \
 	  rm -f $(distdir)/$$file; \
Index: kaffe/libraries/clib/Makefile.am
diff -u kaffe/libraries/clib/Makefile.am:1.12 kaffe/libraries/clib/Makefile.am:1.13
--- kaffe/libraries/clib/Makefile.am:1.12	Wed Dec  1 02:41:51 2004
+++ kaffe/libraries/clib/Makefile.am	Sun Jan 23 18:48:38 2005
@@ -9,6 +9,8 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-SUBDIRS = classpath native io nio net zip math security management
+if COND_LIBXMLJ
+	MAYBE_LIBXMLJ_DIR = libxmlj
+endif
 
-DIST_SUBDIRS = classpath native io nio net zip math libxmlj security management awt sound
+SUBDIRS = classpath native io nio net zip math security management awt sound $(MAYBE_LIBXMLJ_DIR)
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.131 kaffe/libraries/clib/Makefile.in:1.132
--- kaffe/libraries/clib/Makefile.in:1.131	Wed Dec 22 19:05:11 2004
+++ kaffe/libraries/clib/Makefile.in	Sun Jan 23 18:48:38 2005
@@ -88,6 +88,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -360,8 +361,7 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-SUBDIRS = classpath native io nio net zip math security management
-DIST_SUBDIRS = classpath native io nio net zip math libxmlj security management awt sound
+SUBDIRS = classpath native io nio net zip math security management awt sound $(MAYBE_LIBXMLJ_DIR)
 all: all-recursive
 
 .SUFFIXES:
@@ -658,6 +658,8 @@
 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-info-am
 
+
+ at COND_LIBXMLJ_TRUE@	MAYBE_LIBXMLJ_DIR = libxmlj
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.10 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.11
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.10	Thu Jan 13 08:02:17 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am	Sun Jan 23 18:48:38 2005
@@ -77,8 +77,3 @@
 	@X_LIBS@ \
 	-lXtst
 
-$(libgtkpeer_la_SOURCES): libgtkpeer_headers
-
-.PHONY:libgtkpeer_headers
-libgtkpeer_headers:
-	@$(MAKE) -C $(top_builddir)/include libgtkpeer_headers
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.20 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.21
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.20	Thu Jan 13 08:02:17 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in	Sun Jan 23 18:48:39 2005
@@ -1119,12 +1119,6 @@
 	tags uninstall uninstall-am uninstall-info-am \
 	uninstall-nativeLTLIBRARIES
 
-
-$(libgtkpeer_la_SOURCES): libgtkpeer_headers
-
-.PHONY:libgtkpeer_headers
-libgtkpeer_headers:
-	@$(MAKE) -C $(top_builddir)/include libgtkpeer_headers
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: kaffe/libraries/clib/libxmlj/Makefile.am
diff -u kaffe/libraries/clib/libxmlj/Makefile.am:1.5 kaffe/libraries/clib/libxmlj/Makefile.am:1.6
--- kaffe/libraries/clib/libxmlj/Makefile.am:1.5	Fri Jul 30 11:06:43 2004
+++ kaffe/libraries/clib/libxmlj/Makefile.am	Sun Jan 23 18:48:39 2005
@@ -51,8 +51,3 @@
         -module \
 	-export-dynamic \
         -release $(PACKAGE_VERSION)
-
-$(libxmlj_la_SOURCES): libxmlj_headers
-.PHONY:libxmlj_headers
-libxmlj_headers:
-	@$(MAKE) -C $(top_builddir)/include libxmlj_headers
Index: kaffe/libraries/clib/libxmlj/Makefile.in
diff -u kaffe/libraries/clib/libxmlj/Makefile.in:1.32 kaffe/libraries/clib/libxmlj/Makefile.in:1.33
--- kaffe/libraries/clib/libxmlj/Makefile.in:1.32	Wed Dec 22 19:05:17 2004
+++ kaffe/libraries/clib/libxmlj/Makefile.in	Sun Jan 23 18:48:39 2005
@@ -759,11 +759,6 @@
 	tags uninstall uninstall-am uninstall-info-am \
 	uninstall-nativeLTLIBRARIES
 
-
-$(libxmlj_la_SOURCES): libxmlj_headers
-.PHONY:libxmlj_headers
-libxmlj_headers:
-	@$(MAKE) -C $(top_builddir)/include libxmlj_headers
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: kaffe/libraries/clib/sound/alsa/Makefile.am
diff -u kaffe/libraries/clib/sound/alsa/Makefile.am:1.3 kaffe/libraries/clib/sound/alsa/Makefile.am:1.4
--- kaffe/libraries/clib/sound/alsa/Makefile.am:1.3	Fri Jul 30 11:06:48 2004
+++ kaffe/libraries/clib/sound/alsa/Makefile.am	Sun Jan 23 18:48:41 2005
@@ -49,8 +49,3 @@
 	constants_check.h
 
 CLEANFILES = so_locations
-
-$(libtritonusalsa_la_SOURCES): libtritonusalsa_headers
-.PHONY: libtritonusalsa_headers
-libtritonusalsa_headers:
-	@$(MAKE) -C $(top_builddir)/include libtritonusalsa_headers
Index: kaffe/libraries/clib/sound/alsa/Makefile.in
diff -u kaffe/libraries/clib/sound/alsa/Makefile.in:1.29 kaffe/libraries/clib/sound/alsa/Makefile.in:1.30
--- kaffe/libraries/clib/sound/alsa/Makefile.in:1.29	Wed Dec 22 19:05:22 2004
+++ kaffe/libraries/clib/sound/alsa/Makefile.in	Sun Jan 23 18:48:41 2005
@@ -879,11 +879,6 @@
 	tags uninstall uninstall-am uninstall-info-am \
 	uninstall-nativeLTLIBRARIES
 
-
-$(libtritonusalsa_la_SOURCES): libtritonusalsa_headers
-.PHONY: libtritonusalsa_headers
-libtritonusalsa_headers:
-	@$(MAKE) -C $(top_builddir)/include libtritonusalsa_headers
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: kaffe/libraries/clib/sound/esd/Makefile.am
diff -u kaffe/libraries/clib/sound/esd/Makefile.am:1.3 kaffe/libraries/clib/sound/esd/Makefile.am:1.4
--- kaffe/libraries/clib/sound/esd/Makefile.am:1.3	Fri Jul 30 11:06:50 2004
+++ kaffe/libraries/clib/sound/esd/Makefile.am	Sun Jan 23 18:48:41 2005
@@ -30,8 +30,3 @@
 	common.h 
 
 CLEANFILES = so_locations
-
-$(libtritonusesd_la_SOURCES): libtritonusesd_headers
-.PHONY: libtritonusesd_headers
-libtritonusesd_headers:
-	@$(MAKE) -C $(top_builddir)/include libtritonusesd_headers
Index: kaffe/libraries/clib/sound/esd/Makefile.in
diff -u kaffe/libraries/clib/sound/esd/Makefile.in:1.29 kaffe/libraries/clib/sound/esd/Makefile.in:1.30
--- kaffe/libraries/clib/sound/esd/Makefile.in:1.29	Wed Dec 22 19:05:23 2004
+++ kaffe/libraries/clib/sound/esd/Makefile.in	Sun Jan 23 18:48:41 2005
@@ -698,11 +698,6 @@
 	tags uninstall uninstall-am uninstall-info-am \
 	uninstall-nativeLTLIBRARIES
 
-
-$(libtritonusesd_la_SOURCES): libtritonusesd_headers
-.PHONY: libtritonusesd_headers
-libtritonusesd_headers:
-	@$(MAKE) -C $(top_builddir)/include libtritonusesd_headers
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
===================================================================
Checking out kaffe/libraries/javalib/Klasses.jar.bootstrap
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/Attic/Klasses.jar.bootstrap,v
VERS: 1.84
***************
Binary files - and /dev/null differ
cvs [checkout aborted]: received broken pipe signal
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.295 kaffe/libraries/javalib/Makefile.am:1.296
--- kaffe/libraries/javalib/Makefile.am:1.295	Thu Jan 20 20:56:35 2005
+++ kaffe/libraries/javalib/Makefile.am	Sun Jan 23 18:49:02 2005
@@ -77,9 +77,9 @@
 	$(gnu_crypto_key_SRCS) \
 	$(gnu_crypto_key_dh_SRCS) \
 	$(gnu_crypto_key_dss_SRCS) \
+	$(gnu_crypto_keyring_SRCS) \
 	$(gnu_crypto_key_rsa_SRCS) \
 	$(gnu_crypto_key_srp6_SRCS) \
-	$(gnu_crypto_keyring_SRCS) \
 	$(gnu_crypto_mac_SRCS) \
 	$(gnu_crypto_mode_SRCS) \
 	$(gnu_crypto_pad_SRCS) \
@@ -175,9 +175,9 @@
 	$(java_awt_font_SRCS) \
 	$(java_awt_geom_SRCS) \
 	$(java_awt_im_SRCS) \
-	$(java_awt_im_spi_SRCS) \
 	$(java_awt_image_SRCS) \
 	$(java_awt_image_renderable_SRCS) \
+	$(java_awt_im_spi_SRCS) \
 	$(java_awt_peer_SRCS) \
 	$(java_awt_print_SRCS) \
 	$(java_beans_SRCS) \
@@ -332,20 +332,20 @@
 	com/jcraft/jzlib/Deflate.java \
 	com/jcraft/jzlib/InfBlocks.java \
 	com/jcraft/jzlib/InfCodes.java \
-	com/jcraft/jzlib/InfTree.java \
 	com/jcraft/jzlib/Inflate.java \
+	com/jcraft/jzlib/InfTree.java \
 	com/jcraft/jzlib/JZlib.java \
 	com/jcraft/jzlib/StaticTree.java \
 	com/jcraft/jzlib/Tree.java \
 	com/jcraft/jzlib/ZInputStream.java \
 	com/jcraft/jzlib/ZOutputStream.java \
-	com/jcraft/jzlib/ZStream.java \
-	com/jcraft/jzlib/ZStreamException.java
+	com/jcraft/jzlib/ZStreamException.java \
+	com/jcraft/jzlib/ZStream.java
 gnu_classpath_SRCS = \
 	gnu/classpath/Configuration.java \
-	gnu/classpath/RawData.java \
 	gnu/classpath/RawData32.java \
 	gnu/classpath/RawData64.java \
+	gnu/classpath/RawData.java \
 	gnu/classpath/ServiceFactory.java \
 	gnu/classpath/ServiceProviderLoadingAction.java \
 	gnu/classpath/SystemProperties.java \
@@ -365,13 +365,13 @@
 	gnu/crypto/assembly/Operation.java \
 	gnu/crypto/assembly/PaddingTransformer.java \
 	gnu/crypto/assembly/Stage.java \
-	gnu/crypto/assembly/Transformer.java \
-	gnu/crypto/assembly/TransformerException.java
+	gnu/crypto/assembly/TransformerException.java \
+	gnu/crypto/assembly/Transformer.java
 gnu_crypto_auth_SRCS = \
 	gnu/crypto/auth/Password.java
 gnu_crypto_auth_callback_SRCS = \
-	gnu/crypto/auth/callback/AWTCallbackHandler.java \
 	gnu/crypto/auth/callback/AbstractCallbackHandler.java \
+	gnu/crypto/auth/callback/AWTCallbackHandler.java \
 	gnu/crypto/auth/callback/ConsoleCallbackHandler.java \
 	gnu/crypto/auth/callback/DefaultCallbackHandler.java \
 	gnu/crypto/auth/callback/Engine.java \
@@ -395,8 +395,8 @@
 	gnu/crypto/cipher/WeakKeyException.java
 gnu_crypto_der_SRCS = \
 	gnu/crypto/der/BitString.java \
-	gnu/crypto/der/DER.java \
 	gnu/crypto/der/DEREncodingException.java \
+	gnu/crypto/der/DER.java \
 	gnu/crypto/der/DERReader.java \
 	gnu/crypto/der/DERValue.java \
 	gnu/crypto/der/DERWriter.java \
@@ -428,8 +428,8 @@
 	gnu/crypto/jce/PBKDF2SecretKeyFactory.java
 gnu_crypto_jce_cipher_SRCS = \
 	gnu/crypto/jce/cipher/AESSpi.java \
-	gnu/crypto/jce/cipher/ARCFourSpi.java \
 	gnu/crypto/jce/cipher/AnubisSpi.java \
+	gnu/crypto/jce/cipher/ARCFourSpi.java \
 	gnu/crypto/jce/cipher/BlowfishSpi.java \
 	gnu/crypto/jce/cipher/Cast5Spi.java \
 	gnu/crypto/jce/cipher/CipherAdapter.java \
@@ -463,9 +463,9 @@
 	gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/Cast5KeyGeneratorImpl.java \
 	gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java \
+	gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/DESKeyGeneratorImpl.java \
 	gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java \
-	gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/KhazadKeyGeneratorImpl.java \
 	gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/RijndaelKeyGeneratorImpl.java \
@@ -575,32 +575,12 @@
 	gnu/crypto/key/dss/DSSPrivateKey.java \
 	gnu/crypto/key/dss/DSSPublicKey.java \
 	gnu/crypto/key/dss/FIPS186.java
-gnu_crypto_key_rsa_SRCS = \
-	gnu/crypto/key/rsa/GnuRSAKey.java \
-	gnu/crypto/key/rsa/GnuRSAPrivateKey.java \
-	gnu/crypto/key/rsa/GnuRSAPublicKey.java \
-	gnu/crypto/key/rsa/RSAKeyPairGenerator.java \
-	gnu/crypto/key/rsa/RSAKeyPairRawCodec.java
-gnu_crypto_key_srp6_SRCS = \
-	gnu/crypto/key/srp6/SRP6Host.java \
-	gnu/crypto/key/srp6/SRP6KeyAgreement.java \
-	gnu/crypto/key/srp6/SRP6SaslClient.java \
-	gnu/crypto/key/srp6/SRP6SaslServer.java \
-	gnu/crypto/key/srp6/SRP6TLSClient.java \
-	gnu/crypto/key/srp6/SRP6TLSServer.java \
-	gnu/crypto/key/srp6/SRP6User.java \
-	gnu/crypto/key/srp6/SRPAlgorithm.java \
-	gnu/crypto/key/srp6/SRPKey.java \
-	gnu/crypto/key/srp6/SRPKeyPairGenerator.java \
-	gnu/crypto/key/srp6/SRPKeyPairRawCodec.java \
-	gnu/crypto/key/srp6/SRPPrivateKey.java \

*** Patch too long, truncated ***

More information about the kaffe mailing list