PatchSet 7104
Date: 2006/01/22 22:35:48
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed build for kaffe xawt
2006-01-22 Dalibor Topic <[EMAIL PROTECTED]>
Fixed bug #4.
* libraries/javalib/awt-implementations/kaffe/Makefile.am:
(FASTJAR) New variable.
(JAR_CMD1) Use fastjar.
Members:
ChangeLog:1.4624->1.4625
libraries/javalib/awt-implementations/kaffe/Makefile.am:1.8->1.9
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.51->1.52
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4624 kaffe/ChangeLog:1.4625
--- kaffe/ChangeLog:1.4624 Sun Jan 22 19:43:59 2006
+++ kaffe/ChangeLog Sun Jan 22 22:35:48 2006
@@ -1,5 +1,13 @@
2006-01-22 Dalibor Topic <[EMAIL PROTECTED]>
+ Fixed bug #4.
+
+ * libraries/javalib/awt-implementations/kaffe/Makefile.am:
+ (FASTJAR) New variable.
+ (JAR_CMD1) Use fastjar.
+
+2006-01-22 Dalibor Topic <[EMAIL PROTECTED]>
+
* configure.ac: Substitute kaffe_builddir for absolute paths to
builddir.
Used to find fastjar in subbuilds.
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.8
kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.9
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.8 Sat Dec
3 12:55:08 2005
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am Sun Jan
22 22:35:51 2006
@@ -8,7 +8,7 @@
# of this file.
CLASSFILE = kaffeawt.jar
-SRCDIRS = kaffe java org
+SRCDIRS = java org
jrelib_DATA = $(CLASSFILE)
@@ -412,7 +412,8 @@
EXTRA_DIST = \
$(kaffeawt_jar_SRCS)
-JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE)
$(SRCDIRS))
+FASTJAR=$(kaffe_builddir)/external/gcc/fastjar/fastjar
+JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(FASTJAR) -cf $$dstdir/$(CLASSFILE)
$(SRCDIRS))
LIBDIR = lib
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.51
kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.52
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.51 Sun Jan
22 19:44:54 2006
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in Sun Jan
22 22:35:51 2006
@@ -359,7 +359,7 @@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
CLASSFILE = kaffeawt.jar
-SRCDIRS = kaffe java org
+SRCDIRS = java org
jrelib_DATA = $(CLASSFILE)
kaffeawt_jar_SRCS = \
$(java_applet_SRCS) \
@@ -776,7 +776,8 @@
EXTRA_DIST = \
$(kaffeawt_jar_SRCS)
-JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE)
$(SRCDIRS))
+FASTJAR = $(kaffe_builddir)/external/gcc/fastjar/fastjar
+JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(FASTJAR) -cf $$dstdir/$(CLASSFILE)
$(SRCDIRS))
LIBDIR = lib
rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
Klasses_jar =
$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
