From ade710a51ffc2b4657fb33e94de5025ef513fe05 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 7 Jun 2006 21:46:24 +0000 Subject: makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo. 2006-06-07 Thomas Fitzsimmons * 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 --- libjava/gcj/Makefile.in | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'libjava/gcj') diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index c96ba43..6eb6e44 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -126,7 +126,6 @@ GCSPEC = @GCSPEC@ GCTESTSPEC = @GCTESTSPEC@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ -GREP = @GREP@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -187,8 +186,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@ -QT_AWT_FALSE = @QT_AWT_FALSE@ -QT_AWT_TRUE = @QT_AWT_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -227,7 +224,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ VERSION = @VERSION@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ -XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ @@ -237,8 +233,14 @@ ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ +ac_ct_GCJ = @ac_ct_GCJ@ +ac_ct_LD = @ac_ct_LD@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -258,10 +260,7 @@ build_os = @build_os@ build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ -datarootdir = @datarootdir@ dbexecdir = @dbexecdir@ -docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ extra_ldflags_libjava = @extra_ldflags_libjava@ gxx_include_dir = @gxx_include_dir@ @@ -272,7 +271,6 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_subdir = @host_subdir@ host_vendor = @host_vendor@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -280,16 +278,13 @@ libdir = @libdir@ libexecdir = @libexecdir@ libgcj_basedir = @libgcj_basedir@ libstdcxx_incdir = @libstdcxx_incdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mkinstalldirs = @mkinstalldirs@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ subdirs = @subdirs@ -- cgit v1.1