diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-22 14:40:32 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-22 14:40:32 (GMT) |
commit | af4739e677f6edd5572b9250827039914221c185 (patch) | |
tree | df3af4b4860eef2333bbde2f25164cfd80df2f08 /java/src | |
parent | c051bc75745b141736d5d27fed44de1ad24f5f37 (diff) | |
download | hdf5-af4739e677f6edd5572b9250827039914221c185.zip hdf5-af4739e677f6edd5572b9250827039914221c185.tar.gz hdf5-af4739e677f6edd5572b9250827039914221c185.tar.bz2 |
[svn-r29506] Merge of r29465 from trunk.
Java build tweaks
Tested on: jam
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/Makefile.am | 4 | ||||
-rw-r--r-- | java/src/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/Makefile.am b/java/src/Makefile.am index ff8b01a..21aa5ec 100644 --- a/java/src/Makefile.am +++ b/java/src/Makefile.am @@ -33,7 +33,7 @@ SUBDIRS=jni JAVAROOT = .classes classes: - $(MKDIR_P) $(@D)/$(JAVAROOT) + test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar hdf5_javadir = $(libdir) @@ -128,7 +128,7 @@ docs: CLEANFILES = classhdf5_java.stamp $(jarfile) $(JAVAROOT)/$(pkgpath)/callbacks/*.class $(JAVAROOT)/$(pkgpath)/exceptions/*.class $(JAVAROOT)/$(pkgpath)/structs/*.class $(JAVAROOT)/$(pkgpath)/*.class clean: - rm -rf $(JAVAROOT) + rm -rf $(JAVAROOT)/* rm -f $(jarfile) rm -f classhdf5_java.stamp diff --git a/java/src/Makefile.in b/java/src/Makefile.in index 5d7667d..59ad7e3 100644 --- a/java/src/Makefile.in +++ b/java/src/Makefile.in @@ -1025,7 +1025,7 @@ help: @$(top_srcdir)/bin/makehelp classes: - $(MKDIR_P) $(@D)/$(JAVAROOT) + test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) $(jarfile): classhdf5_java.stamp classes docs $(JAR) cvf $@ -C $(JAVAROOT)/ $(pkgpath) @@ -1036,7 +1036,7 @@ docs: $(JAVADOC) -sourcepath $(srcdir) -d javadoc -use -splitIndex -windowtitle $(WINDOWTITLE) -doctitle $(DOCTITLE) -J-Xmx180m -verbose -overview $(top_srcdir)/java/src/hdf/overview.html -classpath $(CLASSPATH_ENV) hdf.hdf5lib clean: - rm -rf $(JAVAROOT) + rm -rf $(JAVAROOT)/* rm -f $(jarfile) rm -f classhdf5_java.stamp |