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/Makefile.in | |
| parent | 36592fa991a4c4f5a91c170338df26274903e430 (diff) | |
| download | gcc-c211aca9b2ee32097b3bc92f59fde1bcf4107a08.tar.gz | |
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/Makefile.in')
| -rw-r--r-- | libjava/classpath/Makefile.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in index e62746e4cbf..957fc5325a4 100644 --- a/libjava/classpath/Makefile.in +++ b/libjava/classpath/Makefile.in @@ -44,11 +44,14 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ltmain.sh missing mkinstalldirs subdir = . 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) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -266,7 +269,7 @@ vm_classes = @vm_classes@ # lib first, to compile .class files before native code, last examples SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) DIST_SUBDIRS = lib doc external include native resource scripts examples -ACLOCAL_AMFLAGS = -I m4 -I ../.. +ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ ChangeLog-2003 ChangeLog-2004 \ ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj @@ -443,7 +446,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/../.. $(distdir)/examples $(distdir)/gnu/classpath $(distdir)/lib $(distdir)/m4 $(distdir)/scripts + $(mkdir_p) $(distdir)/../.. $(distdir)/../../config $(distdir)/examples $(distdir)/gnu/classpath $(distdir)/lib $(distdir)/m4 $(distdir)/scripts @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ |