Hi,
On Fri, 2008-06-13 at 01:47 +0200, Mark Wielaard wrote:
> 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.
Oops, that $(builddir)/generated was a bit of a thinko. This can and
should just be done in the relative generated dir.
2008-06-13 Mark Wielaard <[EMAIL PROTECTED]>
* tools/Makefile.am (USE_JAVAC_FLAGS): Use relative generated dir.
(TOOLS_ZIP): Generate antlr output in relative dir.
Apologies,
Mark
diff -u -r1.48 Makefile.am
--- tools/Makefile.am 12 Jun 2008 23:40:55 -0000 1.48
+++ tools/Makefile.am 13 Jun 2008 00:18:06 -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):$(builddir)/generated:. $(JAVAC_FLAGS)
+USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):generated:.
$(JAVAC_FLAGS)
if CREATE_WRAPPERS
bin_SCRIPTS =
@@ -286,7 +286,7 @@
@rm -rf classes asm generated
mkdir -p classes asm generated/gnu/classpath/tools/gjdoc/expr
## Generate antlr sources.
- $(ANTLR) -o $(builddir)/generated/gnu/classpath/tools/gjdoc/expr \
+ $(ANTLR) -o 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
