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/jawt | |
| parent | dd286892c4b4a6135ed6550ae8b710891f1806da (diff) | |
| download | gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.zip gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.tar.gz gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.tar.bz2 | |
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/jawt')
| -rw-r--r-- | libjava/classpath/native/jawt/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libjava/classpath/native/jawt/Makefile.in b/libjava/classpath/native/jawt/Makefile.in index acfde12..e2298c0 100644 --- a/libjava/classpath/native/jawt/Makefile.in +++ b/libjava/classpath/native/jawt/Makefile.in @@ -290,10 +290,10 @@ gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) gcjversionedlibdir = $(libdir)/gcj-$(gcc_version) gcjversionedlib_LTLIBRARIES = libjawt.la libjawt_la_SOURCES = jawt.c +libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \ -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version` -libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst AM_CPPFLAGS = @CLASSPATH_INCLUDES@ |