diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/Makefile.am | 5 | ||||
| -rw-r--r-- | libjava/classpath/Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 46999d7ffc5..c1d7d2bf117 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-06-15 Thomas Fitzsimmons <fitzsim@redhat.com> + + * classpath/Makefile.am: Do not recurse into tools directory. + * classpath/Makefile.in: Regenerate. + 2006-06-14 Thomas Fitzsimmons <fitzsim@redhat.com> * classpath/tools/Makefile.am (gappletviewer_CFLAGS): Add diff --git a/libjava/classpath/Makefile.am b/libjava/classpath/Makefile.am index 82e97dbde7f..138ea25c1b1 100644 --- a/libjava/classpath/Makefile.am +++ b/libjava/classpath/Makefile.am @@ -1,8 +1,9 @@ ## 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: exclude tools directory +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 21f6a3fead4..2f99e810e1a 100644 --- a/libjava/classpath/Makefile.in +++ b/libjava/classpath/Makefile.in @@ -295,8 +295,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 \ |