diff options
| author | Mark Wielaard <mark@klomp.org> | 2008-06-12 23:40:53 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2008-06-12 23:40:53 +0000 |
| commit | fc856fe8ceadfad5a72892c6519640998578a76d (patch) | |
| tree | 15c8ac24424d5c15a6a82b63c74eea7daa5ab761 /tools | |
| parent | e47df0db96a2d02635ffd3227e2dd387e28f7f1f (diff) | |
| download | classpath-fc856fe8ceadfad5a72892c6519640998578a76d.tar.gz | |
* tools/Makefile.am (USE_JAVAC_FLAGS): Use generated in builddir.
(TOOLS_JAVA_FILES): Include all .java files in all subdirs.
(ALL_TOOLS_FILES): Include gjdoc_resources and antlr input file.
(TOOLS_ZIP): Generate antlr output in builddir.
* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png:
New file from gjdoc.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 10 | ||||
| -rw-r--r-- | tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png | bin | 0 -> 199 bytes |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index d2b097bd2..782a3d218 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,7 +6,7 @@ GLIBJ_CLASSPATH=asm # Setup the compiler to use the GNU Classpath library we just built. JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) -USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):$(srcdir)/generated:. $(JAVAC_FLAGS) +USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):$(builddir)/generated:. $(JAVAC_FLAGS) if CREATE_WRAPPERS bin_SCRIPTS = @@ -113,6 +113,8 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ # All our example java source files TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ + $(srcdir)/gnu/classpath/tools/*.java \ + $(srcdir)/gnu/classpath/tools/*/*.java \ $(srcdir)/gnu/classpath/tools/*/*/*.java \ $(srcdir)/gnu/classpath/tools/*/*/*/*.java \ $(srcdir)/com/sun/javadoc/*.java \ @@ -252,7 +254,9 @@ TOOLS_ZIP = tools.zip BUILT_SOURCES = $(TOOLS_ZIP) # All the files we find "interesting" -ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) $(PROPERTY_FILES) +ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) $(PROPERTY_FILES) \ + $(addprefix $(srcdir)/resource/gnu/classpath/tools/gjdoc/,$(gjdoc_resources))\ + $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g # Some architecture independent data to be installed. TOOLS_DATA = $(TOOLS_ZIP) @@ -282,7 +286,7 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) @rm -rf classes asm generated mkdir -p classes asm generated/gnu/classpath/tools/gjdoc/expr ## Generate antlr sources. - $(ANTLR) -o $(srcdir)/generated/gnu/classpath/tools/gjdoc/expr \ + $(ANTLR) -o $(builddir)/generated/gnu/classpath/tools/gjdoc/expr \ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g ## Compile ASM separately as it is latin-1 encoded. find $(srcdir)/external/asm -name '*.java' -print > asm.lst diff --git a/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png b/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png Binary files differnew file mode 100644 index 000000000..50ca4747c --- /dev/null +++ b/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png |
