Distribute Javadoc generated documentation.

diff --git a/intl-java/ChangeLog b/intl-java/ChangeLog
index 88515ec36fdec0c8335e107c574ff96be46a2fc1..5d9c64a40b8aa6775a103dda2f48baf3d9642ce4 100644 (file)
--- a/intl-java/ChangeLog
+++ b/intl-java/ChangeLog
@@ -1,3 +1,24 @@
+2001-11-03  Bruno Haible  <haible@clisp.cons.org>
+
+       Distribute javadoc generated documentation.
+       * Makefile.am (docdir, htmldir, JAVADOC1, JAVADOC2): New variables.
+       (all-classes): Renamed from all-local.
+       (all-classes-no): Renamed from all-java-no.
+       (all-classes-yes): Renamed from all-java-yes.
+       (install-classes): Renamed from install-data-local.
+       (install-classes-no): Renamed from install-java-no.
+       (install-classes-yes): Renamed from install-java-yes.
+       (installdirs-classes): Renamed from installdirs-local.
+       (uninstall-classes): Renamed from uninstall-local.
+       (all-local, install-data-local, installdirs-local, uninstall-local):
+       New targets.
+       (JAVADOC1_FILES, JAVADOC2_FILES): New variables.
+       (all-javadoc1, javadoc1/tree.html, install-javadoc1,
+       installdirs-javadoc1, uninstall-javadoc1, all-javadoc2,
+       javadoc2/index.html, install-javadoc2, installdirs-javadoc2,
+       uninstall-javadoc2): New targets.
+       (EXTRA_DIST): Add JAVADOC1_FILES and JAVADOC2_FILES.
+
 2001-10-30  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile.am (EXTRA_DIST): New variable.

diff --git a/intl-java/Makefile.am b/intl-java/Makefile.am
index 78923245b7db6489d97827d1b6df29d124abd279..598134eb0d5eccd80e71e30737be152054ac6236 100644 (file)
--- a/intl-java/Makefile.am
+++ b/intl-java/Makefile.am
@@ -20,18 +20,28 @@
 AUTOMAKE_OPTIONS = 1.2 gnits
 
 jardir = $(datadir)/gettext
+docdir = $(prefix)/doc/@PACKAGE@
+htmldir = $(docdir)
 
 JAR = @JAR@
 JAVACOMP = $(SHELL) ../lib/javacomp.sh
+JAVADOC1 = test ! -d /usr/lib/jdk1.1.8 || env PATH=/usr/lib/jdk1.1.8/bin:$$PATH javadoc
+JAVADOC2 = test ! -d /usr/lib/jdk1.3.1 || env PATH=/usr/lib/jdk1.3.1/bin:$$PATH javadoc
 
-EXTRA_DIST = gnu/gettext/GettextResource.java
+EXTRA_DIST = gnu/gettext/GettextResource.java $(JAVADOC1_FILES) $(JAVADOC2_FILES)
+
+
+all-local: all-classes all-javadoc1 all-javadoc2
+install-data-local: install-classes install-javadoc1 install-javadoc2
+installdirs-local: installdirs-classes installdirs-javadoc1 installdirs-javadoc2
+uninstall-local: uninstall-classes uninstall-javadoc1 uninstall-javadoc2
 
 
 # Special rules for Java compilation.
 
-all-local: all-java-@BUILDJAVA@
-all-java-no:
-all-java-yes: libintl.jar
+all-classes: all-classes-@BUILDJAVA@
+all-classes-no:
+all-classes-yes: libintl.jar
 
 gnu/gettext/GettextResource.class: $(srcdir)/gnu/gettext/GettextResource.java
        $(JAVACOMP) -d . $(srcdir)/gnu/gettext/GettextResource.java
@@ -41,19 +51,108 @@ libintl.jar: gnu/gettext/GettextResource.class
 
 CLEANFILES = libintl.jar gnu/gettext/*.class
 
-install-data-local: install-java-@BUILDJAVA@
-install-java-no:
+install-classes: install-classes-@BUILDJAVA@
+install-classes-no:
        $(mkinstalldirs) $(DESTDIR)$(jardir)
-install-java-yes: all-java-yes
+install-classes-yes: all-classes-yes
        $(mkinstalldirs) $(DESTDIR)$(jardir)
        $(INSTALL_DATA) libintl.jar $(DESTDIR)$(jardir)/libintl.jar
 
-installdirs-local:
+installdirs-classes:
        $(mkinstalldirs) $(DESTDIR)$(jardir)
 
-uninstall-local:
+uninstall-classes:
        $(RM) $(DESTDIR)$(jardir)/libintl.jar
 
 
+# Special rules for Javadoc (JDK 1.1) documentation.
+
+all-javadoc1: $(srcdir)/javadoc1/tree.html
+
+$(srcdir)/javadoc1/tree.html: $(srcdir)/gnu/gettext/GettextResource.java
+       cd $(srcdir) && $(JAVADOC1) -d javadoc1 gnu/gettext/*.java
+
+JAVADOC1_FILES = \
+  javadoc1/packages.html javadoc1/tree.html javadoc1/AllNames.html \
+  javadoc1/gnu.gettext.GettextResource.html \
+  javadoc1/images/blue-ball-small.gif javadoc1/images/blue-ball.gif \
+  javadoc1/images/class-index.gif \
+  javadoc1/images/constructor-index.gif \
+  javadoc1/images/constructors.gif \
+  javadoc1/images/cyan-ball-small.gif javadoc1/images/cyan-ball.gif \
+  javadoc1/images/error-index.gif \
+  javadoc1/images/exception-index.gif \
+  javadoc1/images/green-ball-small.gif javadoc1/images/green-ball.gif \
+  javadoc1/images/interface-index.gif \
+  javadoc1/images/magenta-ball-small.gif javadoc1/images/magenta-ball.gif \
+  javadoc1/images/method-index.gif \
+  javadoc1/images/methods.gif \
+  javadoc1/images/package-index.gif \
+  javadoc1/images/red-ball-small.gif javadoc1/images/red-ball.gif \
+  javadoc1/images/variable-index.gif \
+  javadoc1/images/variables.gif \
+  javadoc1/images/yellow-ball-small.gif javadoc1/images/yellow-ball.gif
+
+install-javadoc1: all-javadoc1
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1/images
+       @for f in $(JAVADOC1_FILES); do \
+         echo "$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f"; \
+         $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f; \
+       done
+
+installdirs-javadoc1:
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1/images
+
+uninstall-javadoc1:
+       @for f in $(JAVADOC1_FILES); do \
+         echo "$(RM) $(DESTDIR)$(htmldir)/$$f"; \
+         $(RM) $(DESTDIR)$(htmldir)/$$f; \
+       done
+
+
+# Special rules for Javadoc (JDK 1.2) documentation.
+
+all-javadoc2: $(srcdir)/javadoc2/index.html
+
+$(srcdir)/javadoc2/index.html: $(srcdir)/gnu/gettext/GettextResource.java
+       cd $(srcdir) && $(JAVADOC2) -d javadoc2 gnu/gettext/*.java
+
+JAVADOC2_FILES = \
+  javadoc2/index.html \
+  javadoc2/allclasses-frame.html \
+  javadoc2/overview-tree.html \
+  javadoc2/deprecated-list.html \
+  javadoc2/serialized-form.html \
+  javadoc2/index-all.html \
+  javadoc2/help-doc.html \
+  javadoc2/packages.html \
+  javadoc2/package-list \
+  javadoc2/stylesheet.css \
+  javadoc2/gnu/gettext/package-summary.html \
+  javadoc2/gnu/gettext/package-tree.html \
+  javadoc2/gnu/gettext/package-frame.html \
+  javadoc2/gnu/gettext/GettextResource.html
+
+install-javadoc2: all-javadoc2
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+       @for f in $(JAVADOC2_FILES); do \
+         echo "$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f"; \
+         $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f; \
+       done
+
+installdirs-javadoc2:
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+
+uninstall-javadoc2:
+       @for f in $(JAVADOC2_FILES); do \
+         echo "$(RM) $(DESTDIR)$(htmldir)/$$f"; \
+         $(RM) $(DESTDIR)$(htmldir)/$$f; \
+       done
+
+
 # One more automake bug.
 installdirs: installdirs-local