diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-09-30 20:46:59 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-09-30 20:46:59 +0000 |
| commit | c211aca9b2ee32097b3bc92f59fde1bcf4107a08 (patch) | |
| tree | 6ac7ac7a156fcf9633fef967b394187985e5f56f /libjava/classpath/native/jni/java-lang/Makefile.in | |
| parent | 36592fa991a4c4f5a91c170338df26274903e430 (diff) | |
| download | ppe42-gcc-c211aca9b2ee32097b3bc92f59fde1bcf4107a08.tar.gz ppe42-gcc-c211aca9b2ee32097b3bc92f59fde1bcf4107a08.zip | |
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: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104833 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/native/jni/java-lang/Makefile.in')
| -rw-r--r-- | libjava/classpath/native/jni/java-lang/Makefile.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libjava/classpath/native/jni/java-lang/Makefile.in b/libjava/classpath/native/jni/java-lang/Makefile.in index 2e9ffddd939..861eb9a86e9 100644 --- a/libjava/classpath/native/jni/java-lang/Makefile.in +++ b/libjava/classpath/native/jni/java-lang/Makefile.in @@ -42,11 +42,14 @@ target_triplet = @target@ subdir = native/jni/java-lang DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ - $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ + $(top_srcdir)/../../config/no-executables.m4 \ + $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/accross.m4 \ + $(top_srcdir)/m4/acinclude.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
