Changeset 1474 for trunk/bindings/java/Makefile.am

Timestamp:

09/05/10 16:30:02 (2 years ago)

Author:

Freddie Akeroyd

Message:

More doc tweaks. Also now automatically builds javadoc for web. Refs #231

File:

• trunk/bindings/java/Makefile.am (modified) (5 diffs)

trunk/bindings/java/Makefile.am

@@ -77 +77 @@
                ncsa/hdf/hdflib/ArrayDescriptor.class
 
-clean-local:
-                rm -rf apidoc
 
 noinst_JAVA     = ncsa/hdf/hdflib/HDFArray.java \
@@ -93 +91 @@
                 test/TestJapi.java
 
-EXTRA_DIST      = $(noinst_JAVA) README.JNEXUS COPYING.NCSA 
+EXTRA_DIST      = $(noinst_JAVA) README.JNEXUS COPYING.NCSA
 
 # specific targets
@@ -102 +100 @@
         $(JAVAH) -jni -d native -classpath . org.nexusformat.NexusFile
 
-jnexus.jar: $(jnexus_jar_CLASS)
+jnexus.jar: $(jnexus_jar_CLASS) apidoc
         $(JAR) cvf jnexus.jar $(jnexus_jar_CLASS) \
                ncsa/hdf/hdflib/ArrayDescriptor.class
 
-#all: $(jnexus_jar_ARCHIVE) $(lib_LTLIBRARIES) javadoc
-
-javadoc:        $(noinst_JAVA)
-        test -d apidoc || mkdir apidoc
-        $(JAVADOC) -d apidoc -windowtitle jnexus -doctitle jnexus -classpath . \
-                      -sourcepath $(srcdir) org.nexusformat ncsa.hdf.hdflib
 
 SUFFIXES = .java .class
@@ -118 +110 @@
         $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $<
 
+apidoc : $(noinst_JAVA)
+        test -d apidoc || mkdir apidoc
+        $(JAVADOC) -d apidoc -windowtitle jnexus -doctitle jnexus -classpath . \
+                      -sourcepath $(srcdir) org.nexusformat ncsa.hdf.hdflib
+
+dist-hook :
+        if test -d $(srcdir)/apidoc; then \
+            cp -r $(srcdir)/apidoc $(distdir); \
+        fi
+
+install-data-local :
+        $(mkinstalldirs) $(DESTDIR)$(nxjavadocdir)
+        if test -d $(srcdir)/apidoc; then \
+          cp -r $(srcdir)/apidoc $(DESTDIR)$(nxjavadocdir); \
+          find $(DESTDIR)$(nxjavadocdir)/apidoc -type f -exec chmod 0644 {} \; ;\
+          find $(DESTDIR)$(nxjavadocdir)/apidoc -type d -exec chmod 0755 {} \; ;\
+        fi
+
+clean-local :
+        rm -rf apidoc
+
+uninstall-local :
+        rm -fr $(DESTDIR)$(nxjavadocdir)/apidoc
+
+#
 # Windows import library for DLL
 
@@ -136 +153 @@
 endif
 
+
 ## include $(top_srcdir)/build_rules.am