git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. 

2010-01-18  Andreas Tobler  <andreast@fgznet.ch>

	* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
	* tools/Makefile.in: Regenerate.

From-SVN: r156023
This commit is contained in:
Andreas Tobler 2010-01-18 22:32:40 +01:00 committed by Andreas Tobler
parent ebea03e03e
commit b949bbc8e6
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/classpath/ChangeLog
View File

@ -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> 2009-12-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate. * Makefile.in: Regenerate.

10
libjava/classpath/tools/Makefile.am
View File

@ -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) $(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS)
if !CREATE_GJDOC if !CREATE_GJDOC
GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \ GJDOC_EX = -name gjdoc -prune -o \
-path '*gnu/classpath/tools/doclets' -prune -o \ -name doclets -prune -o \
-path '*gnu/classpath/tools/taglets' -prune -o \ -name taglets -prune -o \
-path '*com/sun/javadoc' -prune -o \ -name javadoc -prune -o
-path '*com/sun/tools/doclets' -prune -o \
-path '*com/sun/tools/javadoc' -prune -o
endif endif
# The zip files with classes we want to produce. # The zip files with classes we want to produce.

10
libjava/classpath/tools/Makefile.in
View File

@ -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_RNGS) $(gnu_classpath_tools_gjdoc_jar_TXTS) \
$(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS) $(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@GJDOC_EX = -name gjdoc -prune -o \
@CREATE_GJDOC_FALSE@ -path '*gnu/classpath/tools/doclets' -prune -o \ @CREATE_GJDOC_FALSE@ -name doclets -prune -o \
@CREATE_GJDOC_FALSE@ -path '*gnu/classpath/tools/taglets' -prune -o \ @CREATE_GJDOC_FALSE@ -name taglets -prune -o \
@CREATE_GJDOC_FALSE@ -path '*com/sun/javadoc' -prune -o \ @CREATE_GJDOC_FALSE@ -name javadoc -prune -o
@CREATE_GJDOC_FALSE@ -path '*com/sun/tools/doclets' -prune -o \
@CREATE_GJDOC_FALSE@ -path '*com/sun/tools/javadoc' -prune -o
# The zip files with classes we want to produce. # The zip files with classes we want to produce.