Hi,
The new gjdoc addition didn't get through a full distcheck. The
following patch fixes that by making sure that it can be build with
builddir != srcdir, has all files included in the dist tar ball, and
adds one missing file.
2008-06-13 Mark Wielaard <[EMAIL PROTECTED]>
* 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.
Committed,
Mark
Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.47
diff -u -r1.47 Makefile.am
--- tools/Makefile.am 27 May 2008 19:25:32 -0000 1.47
+++ tools/Makefile.am 12 Jun 2008 23:40:26 -0000
@@ -6,7 +6,7 @@
# 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 @@
# 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 @@
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 @@
@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
