diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-03-29 21:33:08 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-03-29 21:33:08 +0000 |
| commit | 9b71c701c6eb4e62c08ddeae78103259282b9179 (patch) | |
| tree | 06d5f18d58d0a73759e3c789880af00ca345bc28 /libjava/classpath | |
| parent | 279bb624cabb056d4348fdbb057125f7ddd3cda1 (diff) | |
| download | gcc-9b71c701c6eb4e62c08ddeae78103259282b9179.zip gcc-9b71c701c6eb4e62c08ddeae78103259282b9179.tar.gz gcc-9b71c701c6eb4e62c08ddeae78103259282b9179.tar.bz2 | |
re PR bootstrap/26901 (../../../../../gcc/libjava/classpath/tools/gnu/classpath/tools/AbstractMethodGenerator.java:1: fatal error: unknown encoding: 'roman8')
PR gcc/26901:
* Makefile.in: Rebuilt.
* Makefile.am (SUBDIRS): Remove 'tools'.
(DIST_SUBDIRS): Likewise.
From-SVN: r112510
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 7 | ||||
| -rw-r--r-- | libjava/classpath/Makefile.am | 6 | ||||
| -rw-r--r-- | libjava/classpath/Makefile.in | 14 |
3 files changed, 19 insertions, 8 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index ac151de..56ade6d 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,10 @@ +2006-03-29 Tom Tromey <tromey@redhat.com> + + PR gcc/26901: + * Makefile.in: Rebuilt. + * Makefile.am (SUBDIRS): Remove 'tools'. + (DIST_SUBDIRS): Likewise. + 2006-03-16 Tom Tromey <tromey@redhat.com> PR libgcj/26706: diff --git a/libjava/classpath/Makefile.am b/libjava/classpath/Makefile.am index 82e97db..dc3373a 100644 --- a/libjava/classpath/Makefile.am +++ b/libjava/classpath/Makefile.am @@ -1,8 +1,10 @@ ## Input file for automake to generate the Makefile.in used by configure # lib first, to compile .class files before native code, last examples -SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) -DIST_SUBDIRS = lib doc external include native resource scripts tools examples +## GCJ LOCAL: we remove 'tools' for the time being. +## We don't build any of them into actual tools yet. +SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) +DIST_SUBDIRS = lib doc external include native resource scripts examples ## GCJ LOCAL: we need an extra -I here. ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in index a2bd320..ed5a754 100644 --- a/libjava/classpath/Makefile.in +++ b/libjava/classpath/Makefile.in @@ -44,9 +44,11 @@ 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/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ - $(top_srcdir)/m4/acinclude.m4 \ +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/acattribute.m4 \ + $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ @@ -280,8 +282,8 @@ target_vendor = @target_vendor@ vm_classes = @vm_classes@ # lib first, to compile .class files before native code, last examples -SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) -DIST_SUBDIRS = lib doc external include native resource scripts tools 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 ../.. -I ../../config EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 \ @@ -460,7 +462,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 \ |