diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-03-03 02:26:26 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-03-03 02:26:26 +0000 |
| commit | 0e64b167b833cd6de0c8c3f7ef88699a4b080d25 (patch) | |
| tree | aee7be94f51e17053e87b5a41c0f1054f33a96b9 | |
| parent | 64ee91db92ef41b87b0e769ff6bdb86a4752f38e (diff) | |
| download | classpath-0e64b167b833cd6de0c8c3f7ef88699a4b080d25.tar.gz | |
2008-03-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/28664
* native/jni/Makefile.am: Check CREATE_GMPBI_LIBRARY
and only compile GMP libraries if set.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | native/jni/Makefile.am | 11 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2008-03-03 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR classpath/28664 + * native/jni/Makefile.am: Check CREATE_GMPBI_LIBRARY + and only compile GMP libraries if set. + 2008-03-02 Mark Wielaard <mark@klomp.org> * native/jni/Makefile.am (DIST_SUBDIRS): Add java-math. diff --git a/native/jni/Makefile.am b/native/jni/Makefile.am index 62b04e6f9..e8db33214 100644 --- a/native/jni/Makefile.am +++ b/native/jni/Makefile.am @@ -1,7 +1,7 @@ ## Input file for automake to generate the Makefile.in used by configure if CREATE_CORE_JNI_LIBRARIES - JNIDIRS = native-lib java-io java-lang java-math java-net java-nio java-util + JNIDIRS = native-lib java-io java-lang java-net java-nio java-util endif if CREATE_ALSA_LIBRARIES @@ -32,11 +32,14 @@ if CREATE_XMLJ_LIBRARY XMLJDIR = xmlj endif +if CREATE_GMPBI_LIBRARY + GMPDIR = java-math +endif + SUBDIRS = classpath $(JNIDIRS) \ $(ALSADIR) $(DSSIDIR) $(GTKDIR) $(CLASSPATH_QT_PEER_DIR) $(XMLJDIR) \ - $(CLASSPATH_GCONF_PEER_DIR) $(CLASSPATH_GSTREAMER_PEER_DIR) -DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \ - java-math \ + $(CLASSPATH_GCONF_PEER_DIR) $(CLASSPATH_GSTREAMER_PEER_DIR) $(GMPDIR) +DIST_SUBDIRS = classpath java-io java-lang java-math java-net java-nio java-util \ gtk-peer gconf-peer gstreamer-peer qt-peer xmlj midi-alsa \ midi-dssi native-lib |