diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-07 21:46:24 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-06-07 21:46:24 +0000 |
| commit | ade710a51ffc2b4657fb33e94de5025ef513fe05 (patch) | |
| tree | 3059efcfea3de62c60cdca8f76c6d16830f5258a /libjava/classpath/native/jni/qt-peer/Makefile.am | |
| parent | dd286892c4b4a6135ed6550ae8b710891f1806da (diff) | |
| download | gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.tar.gz | |
makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo.
2006-06-07 Thomas Fitzsimmons <fitzsim@redhat.com>
* scripts/makemake.tcl (emit_bc_rule): Do not skip
gnu-java-awt-peer-qt.lo.
* configure.ac (QT_AWT): Remove conditional.
Do not add gnu/java/awt/peer/qt to standard.omit.
* classpath/native/jni/qt-peer/Makefile.am: Install libqtpeer.so
in GCJ's versioned library directory.
* classpath/gnu/java/awt/peer/qt/QtToolkit.java (initToolkit):
Load libqtpeer.so unconditionally.
* gij.cc (main): Do not re-exec gij.
* Makefile.am: Remove lib-gnu-java-awt-peer-qt.lo build logic.
(gij_LDFLAGS): Point -rpath at GCJ's versioned library directory
when linking gij.
From-SVN: r114473
Diffstat (limited to 'libjava/classpath/native/jni/qt-peer/Makefile.am')
| -rw-r--r-- | libjava/classpath/native/jni/qt-peer/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.am b/libjava/classpath/native/jni/qt-peer/Makefile.am index a9d7d186839..69b17d4ab67 100644 --- a/libjava/classpath/native/jni/qt-peer/Makefile.am +++ b/libjava/classpath/native/jni/qt-peer/Makefile.am @@ -1,8 +1,11 @@ # Qt AWT backend for Classpath # -## GCJ LOCAL: don't install this library -noinst_LTLIBRARIES = libqtpeer.la +## GCJ LOCAL: install this library in GCJ's versioned library +## directory +gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) +gcjversionedlibdir = $(libdir)/gcj-$(gcc_version) +gcjversionedlib_LTLIBRARIES = libqtpeer.la AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ @@ -74,6 +77,10 @@ libqtpeer_la_SOURCES = \ slotcallbacks.cpp \ slotcallbacks.h +## GCJ LOCAL: encode the library path and use GCJ's library version +libqtpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \ + -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version` + BUILT_SOURCES = $(libqtpeer_la_MOC) CLEANFILES = so_locations $(BUILT_SOURCES) |