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/examples/intro | |
| 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/examples/intro')
| -rw-r--r-- | java/examples/intro/Makefile.am | 4 | ||||
| -rw-r--r-- | java/examples/intro/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/examples/intro/Makefile.am b/java/examples/intro/Makefile.am index fef33d2..3d5757a 100644 --- a/java/examples/intro/Makefile.am +++ b/java/examples/intro/Makefile.am @@ -26,7 +26,7 @@ JAVA_API=yes JAVAROOT = .classes classes: - $(MKDIR_P) $(@D)/$(JAVAROOT) + test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = examples/intro hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar @@ -60,7 +60,7 @@ TEST_SCRIPT = $(check_SCRIPTS) CLEANFILES = classnoinst.stamp $(jarfile) $(JAVAROOT)/$(pkgpath)/*.class runExample.sh clean: - rm -rf $(JAVAROOT) + rm -rf $(JAVAROOT)/* rm -f $(jarfile) rm -f classnoinst.stamp diff --git a/java/examples/intro/Makefile.in b/java/examples/intro/Makefile.in index da3b27d..e1cc51a 100644 --- a/java/examples/intro/Makefile.in +++ b/java/examples/intro/Makefile.in @@ -1086,7 +1086,7 @@ help: @$(top_srcdir)/bin/makehelp classes: - $(MKDIR_P) $(@D)/$(JAVAROOT) + test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) $(jarfile): classnoinst.stamp classes $(JAR) cvf $@ -C $(JAVAROOT)/ $(pkgpath) @@ -1094,7 +1094,7 @@ $(jarfile): classnoinst.stamp classes .PHONY: classes clean: - rm -rf $(JAVAROOT) + rm -rf $(JAVAROOT)/* rm -f $(jarfile) rm -f classnoinst.stamp |