diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-07 21:46:24 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-07 21:46:24 +0000 |
| commit | 30f7243e608dd7bf809ebd67daf3eaec35b1e669 (patch) | |
| tree | 3059efcfea3de62c60cdca8f76c6d16830f5258a /libjava/Makefile.am | |
| parent | 55f80fd58ba56dcfd984c063540fccaf7e0be2f4 (diff) | |
| download | ppe42-gcc-30f7243e608dd7bf809ebd67daf3eaec35b1e669.tar.gz ppe42-gcc-30f7243e608dd7bf809ebd67daf3eaec35b1e669.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114473 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index b7c085638ba..d3a637613d7 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -40,10 +40,6 @@ if XLIB_AWT toolexeclib_LTLIBRARIES += lib-gnu-awt-xlib.la endif -if QT_AWT -toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-qt.la -endif - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgcj.pc @@ -247,18 +243,6 @@ $(db_name): gcj-dbtool$(EXEEXT) ## not available. ./gcj-dbtool -n $(db_name) || touch $(db_name) -lib_gnu_java_awt_peer_qt_la_SOURCES = -lib_gnu_java_awt_peer_qt_la_LIBADD = \ - gnu-java-awt-peer-qt.lo \ - classpath/native/jni/qt-peer/libqtpeer.la -lib_gnu_java_awt_peer_qt_la_DEPENDENCIES = gnu-java-awt-peer-qt.lo \ - classpath/native/jni/qt-peer/libqtpeer.la \ - libgcj-$(gcc_version).jar libgcj.la libgcj.spec -## The mysterious backslash in the grep pattern is consumed by make. -lib_gnu_java_awt_peer_qt_la_LDFLAGS = \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst -lib_gnu_java_awt_peer_qt_la_LINK = $(LIBLINK) - lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ @@ -696,7 +680,8 @@ gij_SOURCES = ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## need this because we are explicitly using libtool to link using the ## `.la' file. -gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) +gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \ + -shared-libgcc $(THREADLDFLAGS) gij_LINK = $(GCJLINK) ## See jv_convert_LDADD. gij_LDADD = -L$(here)/.libs libgij.la |
