diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-18 21:32:40 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-18 21:32:40 +0000 |
| commit | 2c5df29d851452254c74c1a86f749a7e2813b8d3 (patch) | |
| tree | 0acb85f5af837a1e5f8764718ec03994d45b96b8 /libjava/classpath | |
| parent | 081c7d0a98b3bb5f844ca03e8369192c64becb50 (diff) | |
| download | gcc-2c5df29d851452254c74c1a86f749a7e2813b8d3.tar.gz | |
2010-01-18 Andreas Tobler <andreast@fgznet.ch>
* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
* tools/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156023 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog | 5 | ||||
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 10 | ||||
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 69d87543213..fa4171ba5bc 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,8 @@ +2010-01-18 Andreas Tobler <andreast@fgznet.ch> + + * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. + * tools/Makefile.in: Regenerate. + 2009-12-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index dfaaf024d3b..44bc49fdf29 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -277,12 +277,10 @@ gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjd $(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS) if !CREATE_GJDOC -GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \ - -path '*gnu/classpath/tools/doclets' -prune -o \ - -path '*gnu/classpath/tools/taglets' -prune -o \ - -path '*com/sun/javadoc' -prune -o \ - -path '*com/sun/tools/doclets' -prune -o \ - -path '*com/sun/tools/javadoc' -prune -o +GJDOC_EX = -name gjdoc -prune -o \ + -name doclets -prune -o \ + -name taglets -prune -o \ + -name javadoc -prune -o endif # The zip files with classes we want to produce. diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 54e689f5fa9..1258e328958 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -684,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. |