re PR bootstrap/26901 (../../../../../gcc/libjava/classpath/tools/gnu/classpath/tools...

	PR gcc/26901:
	* Makefile.in: Rebuilt.
	* Makefile.am (SUBDIRS): Remove 'tools'.
	(DIST_SUBDIRS): Likewise.

From-SVN: r112510

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index ac151deefc5aae1d6a2e9298fcbaa9db7ffc3db9..56ade6d6efcc5cfabdad8c9da5bd6ef255b7226e 100644 (file)
--- 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 82e97dbde7f9c8bcaa30da57458c50b41e76a58c..dc3373a190fc0d0cdf4db53e10329701f7031379 100644 (file)
--- 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 a2bd3200269069dc5c0359f685bf670e65290012..ed5a75429e801ca381de972ec58f707d8eda319a 100644 (file)
--- 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 \