[kaffe] CVS kaffe (dalibor): Only build java gmp libs if gmp support is enabled

Kaffe CVS cvs-commits at kaffe.org
Tue Sep 14 13:21:08 PDT 2004


PatchSet 5168 
Date: 2004/09/14 20:17:27
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Only build java gmp libs if gmp support is enabled

2004-09-14  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/Makefile.am.in
        Only build gmp math when native libs are
        built, too.

        * libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.2723->1.2724 
	libraries/javalib/Makefile.am:1.232->1.233 
	libraries/javalib/Makefile.am.in:1.22->1.23 
	libraries/javalib/Makefile.in:1.310->1.311 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2723 kaffe/ChangeLog:1.2724
--- kaffe/ChangeLog:1.2723	Tue Sep 14 18:28:37 2004
+++ kaffe/ChangeLog	Tue Sep 14 20:17:27 2004
@@ -1,6 +1,18 @@
 2004-09-14  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/Makefile.am.in
+	Only build gmp math when native libs are 
+	built, too.
+
+	* libraries/javalib/Makefile.am,
+	libraries/javalib/Makefile.in:
+	Regenerated.
+
+	Reported by: Kiyo Inaba <inaba at src.ricoh.co.jp>
+
+2004-09-14  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/Makefile.am.in
 	(KAFFELIBRARYPATH) Add security library.
 
 	* libraries/javalib/Makefile.am,
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.232 kaffe/libraries/javalib/Makefile.am:1.233
--- kaffe/libraries/javalib/Makefile.am:1.232	Tue Sep 14 18:28:39 2004
+++ kaffe/libraries/javalib/Makefile.am	Tue Sep 14 20:17:29 2004
@@ -31,7 +31,14 @@
 endif
 endif
 
-SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) gmp-math
+# Only build gmp java.math libraries if kaffe is configured
+# to build the native libraries as well.
+if COND_PURE_JAVA_MATH
+else
+MAYBE_GMP_JAVA_MATH=gmp-math
+endif
+
+SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 
 SRCDIRS = com gnu java javax kaffe org
 
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.22 kaffe/libraries/javalib/Makefile.am.in:1.23
--- kaffe/libraries/javalib/Makefile.am.in:1.22	Tue Sep 14 18:28:39 2004
+++ kaffe/libraries/javalib/Makefile.am.in	Tue Sep 14 20:17:30 2004
@@ -31,7 +31,14 @@
 endif
 endif
 
-SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) gmp-math
+# Only build gmp java.math libraries if kaffe is configured
+# to build the native libraries as well.
+if COND_PURE_JAVA_MATH
+else
+MAYBE_GMP_JAVA_MATH=gmp-math
+endif
+
+SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 
 SRCDIRS = com gnu java javax kaffe org
 
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.310 kaffe/libraries/javalib/Makefile.in:1.311
--- kaffe/libraries/javalib/Makefile.in:1.310	Tue Sep 14 18:28:39 2004
+++ kaffe/libraries/javalib/Makefile.in	Tue Sep 14 20:17:30 2004
@@ -377,7 +377,11 @@
 # Only build the peerless AWT libraries if kaffe is configured to
 # build the native libraries as well.
 @COND_KAFFE_QT_AWT_TRUE at MAYBE_PEERLESS_KAFFE_AWT = awt-implementations
-SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) gmp-math
+
+# Only build gmp java.math libraries if kaffe is configured
+# to build the native libraries as well.
+ at COND_PURE_JAVA_MATH_FALSE@MAYBE_GMP_JAVA_MATH = gmp-math
+SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
 SRCDIRS = com gnu java javax kaffe org
 JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
 KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/:$(top_builddir)/libraries/clib/security/




More information about the kaffe mailing list