summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-03-22 14:40:32 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-03-22 14:40:32 (GMT)
commitaf4739e677f6edd5572b9250827039914221c185 (patch)
treedf3af4b4860eef2333bbde2f25164cfd80df2f08
parentc051bc75745b141736d5d27fed44de1ad24f5f37 (diff)
downloadhdf5-af4739e677f6edd5572b9250827039914221c185.zip
hdf5-af4739e677f6edd5572b9250827039914221c185.tar.gz
hdf5-af4739e677f6edd5572b9250827039914221c185.tar.bz2
[svn-r29506] Merge of r29465 from trunk.
Java build tweaks Tested on: jam
Diffstat
-rw-r--r--java/examples/datasets/Makefile.am4
-rw-r--r--java/examples/datasets/Makefile.in4
-rw-r--r--java/examples/datatypes/Makefile.am4
-rw-r--r--java/examples/datatypes/Makefile.in4
-rw-r--r--java/examples/groups/Makefile.am4
-rw-r--r--java/examples/groups/Makefile.in4
-rw-r--r--java/examples/intro/Makefile.am4
-rw-r--r--java/examples/intro/Makefile.in4
-rw-r--r--java/src/Makefile.am4
-rw-r--r--java/src/Makefile.in4
-rw-r--r--java/test/Makefile.am4
-rw-r--r--java/test/Makefile.in4
12 files changed, 24 insertions, 24 deletions
diff --git a/java/examples/datasets/Makefile.am b/java/examples/datasets/Makefile.am
index 49888a0..41ba6d1 100644
--- a/java/examples/datasets/Makefile.am
+++ b/java/examples/datasets/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/datasets
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
@@ -71,7 +71,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/datasets/Makefile.in b/java/examples/datasets/Makefile.in
index f33198b..52210af 100644
--- a/java/examples/datasets/Makefile.in
+++ b/java/examples/datasets/Makefile.in
@@ -1097,7 +1097,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)
@@ -1105,7 +1105,7 @@ $(jarfile): classnoinst.stamp classes
.PHONY: classes
clean:
- rm -rf $(JAVAROOT)
+ rm -rf $(JAVAROOT)/*
rm -f $(jarfile)
rm -f classnoinst.stamp
diff --git a/java/examples/datatypes/Makefile.am b/java/examples/datatypes/Makefile.am
index de2ea9d..7d95a56 100644
--- a/java/examples/datatypes/Makefile.am
+++ b/java/examples/datatypes/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/datatypes
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
@@ -71,7 +71,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/datatypes/Makefile.in b/java/examples/datatypes/Makefile.in
index efeaa02..c8a1bd3 100644
--- a/java/examples/datatypes/Makefile.in
+++ b/java/examples/datatypes/Makefile.in
@@ -1097,7 +1097,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)
@@ -1105,7 +1105,7 @@ $(jarfile): classnoinst.stamp classes
.PHONY: classes
clean:
- rm -rf $(JAVAROOT)
+ rm -rf $(JAVAROOT)/*
rm -f $(jarfile)
rm -f classnoinst.stamp
diff --git a/java/examples/groups/Makefile.am b/java/examples/groups/Makefile.am
index 802e2b0..be15b42 100644
--- a/java/examples/groups/Makefile.am
+++ b/java/examples/groups/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/groups
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
@@ -61,7 +61,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/groups/Makefile.in b/java/examples/groups/Makefile.in
index 9e3308a..575e562 100644
--- a/java/examples/groups/Makefile.in
+++ b/java/examples/groups/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
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
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
diff --git a/java/test/Makefile.am b/java/test/Makefile.am
index 2c960ee..92ac12d 100644
--- a/java/test/Makefile.am
+++ b/java/test/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 = test
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
@@ -97,7 +97,7 @@ AllJunitTests :
chmod +x $@
clean:
- rm -rf $(JAVAROOT)
+ rm -rf $(JAVAROOT)/*
rm -f $(jarfile)
rm -f classnoinst.stamp
diff --git a/java/test/Makefile.in b/java/test/Makefile.in
index 384f000..bbc6322 100644
--- a/java/test/Makefile.in
+++ b/java/test/Makefile.in
@@ -1118,7 +1118,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)
@@ -1132,7 +1132,7 @@ AllJunitTests :
chmod +x $@
clean:
- rm -rf $(JAVAROOT)
+ rm -rf $(JAVAROOT)/*
rm -f $(jarfile)
rm -f classnoinst.stamp
generated by cgit v0.12 at 2024-06-28 23:57:30 (GMT)