classpath,
GCC's libjava uses classpath. GCC now has html and install-html support.
The top-level html build triggers libjava/classpath/doc/api/Makefile.in's
create_html target. This target should only execute $(GJDOC) if the
variable is set (it is disabled by default).
The patch provided fixes the build problem.
Comments?
Cheers,
Carlos.
--
Carlos O'Donell
CodeSourcery
[EMAIL PROTECTED]
(650) 331-3385 x716
2006-05-24 Carlos O'Donell <[EMAIL PROTECTED]>
* doc/api/Makefile.am: Build documentation if $(GJDOC) is present.
Index: doc/api/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/doc/api/Makefile.am,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile.am
--- doc/api/Makefile.am 30 Jan 2006 12:52:53 -0000 1.19
+++ doc/api/Makefile.am 24 May 2006 17:32:32 -0000
@@ -35,19 +35,23 @@ clean-local:
-rm -rf html create_html gjdoc_rawcomment.cache
create_html:
- -$(MKDIR) html > /dev/null 2>&1
- $(GJDOC) \
- -use \
- -sourcepath "$(sourcepath)" \
- -encoding UTF-8 \
- -breakiterator \
- -licensetext \
- -linksource \
- -splitindex \
- -validhtml \
- -d html \
- -doctitle "GNU Classpath $(VERSION)" \
- -windowtitle "GNU Classpath $(VERSION) Documentation" \
- -header $(classpathbox) -footer $(classpathbox) \
- -subpackages java:javax:org
- touch create_html
+ if ! test -z "$(GJDOC)"; then \
+ -$(MKDIR) html > /dev/null 2>&1; \
+ $(GJDOC) \
+ -use \
+ -sourcepath "$(sourcepath)" \
+ -encoding UTF-8 \
+ -breakiterator \
+ -licensetext \
+ -linksource \
+ -splitindex \
+ -d html \
+ -doctitle "GNU Classpath $(VERSION)" \
+ -windowtitle "GNU Classpath $(VERSION) Documentation" \
+ -header $(classpathbox) -footer $(classpathbox) \
+ -subpackages java:javax:org; \
+ touch "create_html"; \
+ else \
+ echo "GJDOC not enabled. HTML files not built."; \
+ fi;
+
