diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-11-12 21:55:13 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-11-12 21:55:13 +0100 |
| commit | 4bf95cef95a966c0ed8325cf8a572c98a3cc0e90 (patch) | |
| tree | 6785b58cfdd6121c5789e7ff48659fa27fa86f0c /libjava/classpath/native/jni | |
| parent | 41b81065aeaf755949819944088e09aa528a9b06 (diff) | |
| download | gcc-4bf95cef95a966c0ed8325cf8a572c98a3cc0e90.zip gcc-4bf95cef95a966c0ed8325cf8a572c98a3cc0e90.tar.gz gcc-4bf95cef95a966c0ed8325cf8a572c98a3cc0e90.tar.bz2 | |
re PR libgcj/33764 (gij is built as 32-bit binary when building multilib gcc)
PR libgcj/33764
libjava/
* configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL.
* Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS
instead of bin_PROGRAMS for binaries.
* configure: Regenerated.
* Makefile.in: Regenerated.
libjava/classpath/
* configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL.
* tools/Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS
instead of bin_PROGRAMS for binaries.
* configure: Regenerated.
* tools/Makefile.in: Regenerated.
From-SVN: r141801
Diffstat (limited to 'libjava/classpath/native/jni')
16 files changed, 32 insertions, 0 deletions
diff --git a/libjava/classpath/native/jni/Makefile.in b/libjava/classpath/native/jni/Makefile.in index 3d37377..bf2608f 100644 --- a/libjava/classpath/native/jni/Makefile.in +++ b/libjava/classpath/native/jni/Makefile.in @@ -190,6 +190,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/classpath/Makefile.in b/libjava/classpath/native/jni/classpath/Makefile.in index a2a5b0a..017edd8 100644 --- a/libjava/classpath/native/jni/classpath/Makefile.in +++ b/libjava/classpath/native/jni/classpath/Makefile.in @@ -200,6 +200,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.in b/libjava/classpath/native/jni/gconf-peer/Makefile.in index d3163e7..3f77b6a 100644 --- a/libjava/classpath/native/jni/gconf-peer/Makefile.in +++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in @@ -209,6 +209,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/gstreamer-peer/Makefile.in b/libjava/classpath/native/jni/gstreamer-peer/Makefile.in index 3a576a2..0719b3a 100644 --- a/libjava/classpath/native/jni/gstreamer-peer/Makefile.in +++ b/libjava/classpath/native/jni/gstreamer-peer/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/gtk-peer/Makefile.in b/libjava/classpath/native/jni/gtk-peer/Makefile.in index 1941b4e..d277f15 100644 --- a/libjava/classpath/native/jni/gtk-peer/Makefile.in +++ b/libjava/classpath/native/jni/gtk-peer/Makefile.in @@ -247,6 +247,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-io/Makefile.in b/libjava/classpath/native/jni/java-io/Makefile.in index 8423de8..a7398bc 100644 --- a/libjava/classpath/native/jni/java-io/Makefile.in +++ b/libjava/classpath/native/jni/java-io/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-lang/Makefile.in b/libjava/classpath/native/jni/java-lang/Makefile.in index e07e206..cbf37b7 100644 --- a/libjava/classpath/native/jni/java-lang/Makefile.in +++ b/libjava/classpath/native/jni/java-lang/Makefile.in @@ -225,6 +225,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-math/Makefile.in b/libjava/classpath/native/jni/java-math/Makefile.in index 832739b..710ea10 100644 --- a/libjava/classpath/native/jni/java-math/Makefile.in +++ b/libjava/classpath/native/jni/java-math/Makefile.in @@ -209,6 +209,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-net/Makefile.in b/libjava/classpath/native/jni/java-net/Makefile.in index 69390bc..f40a7f0 100644 --- a/libjava/classpath/native/jni/java-net/Makefile.in +++ b/libjava/classpath/native/jni/java-net/Makefile.in @@ -221,6 +221,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-nio/Makefile.in b/libjava/classpath/native/jni/java-nio/Makefile.in index 150b968..242d923 100644 --- a/libjava/classpath/native/jni/java-nio/Makefile.in +++ b/libjava/classpath/native/jni/java-nio/Makefile.in @@ -219,6 +219,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-util/Makefile.in b/libjava/classpath/native/jni/java-util/Makefile.in index d847924..0c397fe 100644 --- a/libjava/classpath/native/jni/java-util/Makefile.in +++ b/libjava/classpath/native/jni/java-util/Makefile.in @@ -208,6 +208,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/midi-alsa/Makefile.in b/libjava/classpath/native/jni/midi-alsa/Makefile.in index c9e96f1..2d09a67 100644 --- a/libjava/classpath/native/jni/midi-alsa/Makefile.in +++ b/libjava/classpath/native/jni/midi-alsa/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/midi-dssi/Makefile.in b/libjava/classpath/native/jni/midi-dssi/Makefile.in index 764f38e..25f9c9e 100644 --- a/libjava/classpath/native/jni/midi-dssi/Makefile.in +++ b/libjava/classpath/native/jni/midi-dssi/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/native-lib/Makefile.in b/libjava/classpath/native/jni/native-lib/Makefile.in index d1bde49..d56d058 100644 --- a/libjava/classpath/native/jni/native-lib/Makefile.in +++ b/libjava/classpath/native/jni/native-lib/Makefile.in @@ -200,6 +200,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.in b/libjava/classpath/native/jni/qt-peer/Makefile.in index 1c1b8d0..36c0bf1 100644 --- a/libjava/classpath/native/jni/qt-peer/Makefile.in +++ b/libjava/classpath/native/jni/qt-peer/Makefile.in @@ -226,6 +226,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/xmlj/Makefile.in b/libjava/classpath/native/jni/xmlj/Makefile.in index a5b48e1..351536a 100644 --- a/libjava/classpath/native/jni/xmlj/Makefile.in +++ b/libjava/classpath/native/jni/xmlj/Makefile.in @@ -210,6 +210,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ |