diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-09-30 20:46:59 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2005-09-30 20:46:59 +0000 |
| commit | 682fb59799e3c6d74fedfd5b2955569be41dee0c (patch) | |
| tree | 6ac7ac7a156fcf9633fef967b394187985e5f56f /libjava/Makefile.am | |
| parent | 62230903598f5c1129150f0913beae3257749b7e (diff) | |
libjava:
PR libgcj/24051:
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Add Qt library if
requested.
(lib_gnu_java_awt_peer_qt_la_SOURCES): New variable.
(lib_gnu_java_awt_peer_qt_la_LIBADD): Likewise.
(lib_gnu_java_awt_peer_qt_la_DEPENDENCIES): Likewise.
(lib_gnu_java_awt_peer_qt_la_LDFLAGS): Likewise.
(lib_gnu_java_awt_peer_qt_la_LINK): Likewise.
* configure: Rebuilt.
* configure.ac: Pass --enable-qt-peers when qt is requested.
libjava/classpath:
PR libgcj/24051:
* Makefile.in: Rebuilt.
* Makefile.am (ACLOCAL_AMFLAGS): Added -I ../../config
* configure: Rebuilt.
* configure.ac: Use GCC_NO_EXECUTABLES
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@104833 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 725e5d43ac1..c0c4b595d58 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -41,6 +41,10 @@ if GTK_AWT toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-gtk.la libgcjawt.la endif +if QT_AWT +toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-qt.la +endif + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgcj.pc @@ -273,6 +277,18 @@ libgcjawt_la_LDFLAGS = \ $(LIBGCJ_LD_SYMBOLIC) libgcjawt_la_LINK = $(LIBLINK) +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 \ |