Update to Automake 1.11.1.

[pf3gnuchains/gcc-fork.git] / libjava / classpath / tools / Makefile.in

diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index bf762b4..bebea3d 100644 (file)
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -431,7 +431,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 multi_basedir = @multi_basedir@
@@ -685,12 +684,10 @@ gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjd
        $(gnu_classpath_tools_gjdoc_jar_RNGS) $(gnu_classpath_tools_gjdoc_jar_TXTS) \
        $(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS)
 
-@CREATE_GJDOC_FALSE@GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*gnu/classpath/tools/doclets' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*gnu/classpath/tools/taglets' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*com/sun/javadoc' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*com/sun/tools/doclets' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*com/sun/tools/javadoc' -prune -o
+@CREATE_GJDOC_FALSE@GJDOC_EX = -name gjdoc -prune -o \
+@CREATE_GJDOC_FALSE@   -name doclets -prune -o \
+@CREATE_GJDOC_FALSE@   -name taglets -prune -o \
+@CREATE_GJDOC_FALSE@   -name javadoc -prune -o
 
 
 # The zip files with classes we want to produce.
@@ -711,10 +708,10 @@ noinst_DATA = $(TOOLS_ZIP)
 
 # Where we want these data files installed.
 TOOLSdir = $(pkgdatadir)
-@WITH_JAR_FALSE@CREATE_TOOLS_ZIP = $(ZIP) -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
-@WITH_JAR_TRUE@CREATE_TOOLS_ZIP = $(JAR) cf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
-@WITH_JAR_FALSE@UPDATE_TOOLS_ZIP = $(ZIP) -u -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
-@WITH_JAR_TRUE@UPDATE_TOOLS_ZIP = $(JAR) uf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
+@WITH_JAR_FALSE@CREATE_TOOLS_ZIP = $(ZIP) -r ../$(TOOLS_ZIP) .
+@WITH_JAR_TRUE@CREATE_TOOLS_ZIP = $(JAR) cf ../$(TOOLS_ZIP) .
+@WITH_JAR_FALSE@UPDATE_TOOLS_ZIP = $(ZIP) -u -r ../$(TOOLS_ZIP) .
+@WITH_JAR_TRUE@UPDATE_TOOLS_ZIP = $(JAR) uf ../$(TOOLS_ZIP) .
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1427,6 +1424,9 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES)
        done
        cp -pR $(srcdir)/asm .
        cp -pR $(srcdir)/classes .
+       if [ -d asm/.svn ]; then \
+         find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \
+       fi
 @CREATE_GJDOC_TRUE@    for res in $(gjdoc_resources); do \
 @CREATE_GJDOC_TRUE@      dir=classes/`dirname $$res`; \
 @CREATE_GJDOC_TRUE@      if ! test -d "$$dir"; then @mkdir_p@ "$$dir"; fi; \