diff options
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) |