[kaffe] CVS kaffe (robilad): Build fixes for native math libs

[Kaffe CVS]

PatchSet 6459 
Date: 2005/05/14 22:31:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Build fixes for native math libs

2005-05-14  Tom Tromey  <tromey at redhat.com>

        * libraries/javalib/gmp-math/Makefile.am (Klasses_jar): Include
        srcdir; search for rt.jar in builddir.
        (compile-classes $(LIBDIR)/stamp classes): Pass LIBDIR to
        rebuildLib.

Members: 
	ChangeLog:1.3986->1.3987 
	libraries/javalib/gmp-math/Makefile.am:1.4->1.5 
	libraries/javalib/gmp-math/Makefile.in:1.30->1.31 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3986 kaffe/ChangeLog:1.3987
--- kaffe/ChangeLog:1.3986	Sat May 14 21:46:15 2005
+++ kaffe/ChangeLog	Sat May 14 22:31:11 2005
@@ -1,4 +1,11 @@
-2005-05-13  Dalibor Topic  <robilad at kaffe.org>
+2005-05-14  Tom Tromey  <tromey at redhat.com>
+
+	* libraries/javalib/gmp-math/Makefile.am (Klasses_jar): Include
+	srcdir; search for rt.jar in builddir.
+	(compile-classes $(LIBDIR)/stamp classes): Pass LIBDIR to
+	rebuildLib.
+
+2005-05-14  Dalibor Topic  <robilad at kaffe.org>
 
         * include/jni_md.h: New file. 
 	Merged in from GNU Classpath and gcj.
Index: kaffe/libraries/javalib/gmp-math/Makefile.am
diff -u kaffe/libraries/javalib/gmp-math/Makefile.am:1.4 kaffe/libraries/javalib/gmp-math/Makefile.am:1.5
--- kaffe/libraries/javalib/gmp-math/Makefile.am:1.4	Fri Feb 11 04:56:58 2005
+++ kaffe/libraries/javalib/gmp-math/Makefile.am	Sat May 14 22:31:17 2005
@@ -1,7 +1,7 @@
 #
 # Kaffe GNU MP-based BigInteger and BigDecimal implementation.
 #
-# Copyright (c) 2004
+# Copyright (c) 2004, 2005
 # 	Kaffe.org contributors. All rights reserved. See ChangeLog for details.
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -35,7 +35,7 @@
 	cd $(srcdir) && $(SHELL) $(top_srcdir)/developers/update-class-list
 
 rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
-Klasses_jar = $(top_srcdir)/libraries/javalib/rt.jar
+Klasses_jar = $(srcdir):$(top_builddir)/libraries/javalib/rt.jar
 
 .PHONY: compile-classes classes
 ## classes is provided for backward compatibility; use compile-classes
@@ -43,7 +43,7 @@
 	rm -rf $(LIBDIR)
 	mkdir $(LIBDIR)
 	echo $(SHELL) $(rebuildLib)
-	CLASSPATH=$(Klasses_jar) $(SHELL) $(rebuildLib) $(gmpjavamath_jar_SRCS)
+	LIBDIR=$(LIBDIR) CLASSPATH=$(Klasses_jar) $(SHELL) $(rebuildLib) $(gmpjavamath_jar_SRCS)
 	echo timestamp > $(LIBDIR)/stamp
 
 .PHONY: jar-classes
Index: kaffe/libraries/javalib/gmp-math/Makefile.in
diff -u kaffe/libraries/javalib/gmp-math/Makefile.in:1.30 kaffe/libraries/javalib/gmp-math/Makefile.in:1.31
--- kaffe/libraries/javalib/gmp-math/Makefile.in:1.30	Sat May 14 21:47:07 2005
+++ kaffe/libraries/javalib/gmp-math/Makefile.in	Sat May 14 22:31:17 2005
@@ -17,7 +17,7 @@
 #
 # Kaffe GNU MP-based BigInteger and BigDecimal implementation.
 #
-# Copyright (c) 2004
+# Copyright (c) 2004, 2005
 # 	Kaffe.org contributors. All rights reserved. See ChangeLog for details.
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -378,7 +378,7 @@
 JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE) $(SRCDIRS))
 LIBDIR = lib
 rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
-Klasses_jar = $(top_srcdir)/libraries/javalib/rt.jar
+Klasses_jar = $(srcdir):$(top_builddir)/libraries/javalib/rt.jar
 all: all-am
 
 .SUFFIXES:
@@ -574,7 +574,7 @@
 	rm -rf $(LIBDIR)
 	mkdir $(LIBDIR)
 	echo $(SHELL) $(rebuildLib)
-	CLASSPATH=$(Klasses_jar) $(SHELL) $(rebuildLib) $(gmpjavamath_jar_SRCS)
+	LIBDIR=$(LIBDIR) CLASSPATH=$(Klasses_jar) $(SHELL) $(rebuildLib) $(gmpjavamath_jar_SRCS)
 	echo timestamp > $(LIBDIR)/stamp
 
 .PHONY: jar-classes