summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-03-17 16:47:21 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-03-17 16:47:21 (GMT)
commitb8e163a84563fa9d960f41a64aee785f96f40300 (patch)
tree2accc88d57c054ebec37fa67b6fe9cecb53fc55f
parent83acb60e39943fe7e4772194cbdf491d4d3e86d1 (diff)
downloadhdf5-b8e163a84563fa9d960f41a64aee785f96f40300.zip
hdf5-b8e163a84563fa9d960f41a64aee785f96f40300.tar.gz
hdf5-b8e163a84563fa9d960f41a64aee785f96f40300.tar.bz2
[svn-r29465] Fix issue with .classes dir not getting created for java by adding mkdir .classes to configure.
-rw-r--r--configure.ac7
-rw-r--r--java/examples/datasets/Makefile.am6
-rw-r--r--java/examples/datatypes/Makefile.am6
-rw-r--r--java/examples/groups/Makefile.am6
-rw-r--r--java/examples/intro/Makefile.am6
-rw-r--r--java/src/Makefile.am6
-rw-r--r--java/test/Makefile.am6
7 files changed, 25 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index b4492b1..e80eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3582,6 +3582,13 @@ AC_CONFIG_FILES([src/libhdf5.settings
hl/fortran/examples/Makefile
hl/fortran/examples/run-hlfortran-ex.sh])
+AC_CONFIG_COMMANDS([.classes], [], [$MKDIR_P java/src/.classes;
+ $MKDIR_P java/test/.classes;
+ $MKDIR_P java/examples/intro/.classes;
+ $MKDIR_P java/examples/datasets/.classes;
+ $MKDIR_P java/examples/datatypes/.classes;
+ $MKDIR_P java/examples/groups/.classes])
+
AC_OUTPUT
chmod 755 tools/misc/h5cc
diff --git a/java/examples/datasets/Makefile.am b/java/examples/datasets/Makefile.am
index 8498cff..41ba6d1 100644
--- a/java/examples/datasets/Makefile.am
+++ b/java/examples/datasets/Makefile.am
@@ -23,10 +23,10 @@ include $(top_srcdir)/config/commence.am
# Mark this directory as part of the JNI API
JAVA_API=yes
-JAVAROOT = $(top_builddir)/.classes
+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/datatypes/Makefile.am b/java/examples/datatypes/Makefile.am
index fedfec3..7d95a56 100644
--- a/java/examples/datatypes/Makefile.am
+++ b/java/examples/datatypes/Makefile.am
@@ -23,10 +23,10 @@ include $(top_srcdir)/config/commence.am
# Mark this directory as part of the JNI API
JAVA_API=yes
-JAVAROOT = $(top_builddir)/.classes
+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/groups/Makefile.am b/java/examples/groups/Makefile.am
index 181d2d9..be15b42 100644
--- a/java/examples/groups/Makefile.am
+++ b/java/examples/groups/Makefile.am
@@ -23,10 +23,10 @@ include $(top_srcdir)/config/commence.am
# Mark this directory as part of the JNI API
JAVA_API=yes
-JAVAROOT = $(top_builddir)/.classes
+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/intro/Makefile.am b/java/examples/intro/Makefile.am
index af4022b..3d5757a 100644
--- a/java/examples/intro/Makefile.am
+++ b/java/examples/intro/Makefile.am
@@ -23,10 +23,10 @@ include $(top_srcdir)/config/commence.am
# Mark this directory as part of the JNI API
JAVA_API=yes
-JAVAROOT = $(top_builddir)/.classes
+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/src/Makefile.am b/java/src/Makefile.am
index 3609f20..f2e12a7 100644
--- a/java/src/Makefile.am
+++ b/java/src/Makefile.am
@@ -30,10 +30,10 @@ JAVA_API=yes
SUBDIRS=jni
-JAVAROOT = $(top_builddir)/.classes
+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)
@@ -126,7 +126,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/test/Makefile.am b/java/test/Makefile.am
index d294d46..9f29f1c 100644
--- a/java/test/Makefile.am
+++ b/java/test/Makefile.am
@@ -23,10 +23,10 @@ include $(top_srcdir)/config/commence.am
# Mark this directory as part of the JNI API
JAVA_API=yes
-JAVAROOT = $(top_builddir)/.classes
+JAVAROOT = .classes
classes:
- $(MKDIR_P) $(@D)/$(JAVAROOT)
+ test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
pkgpath = test
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
@@ -96,7 +96,7 @@ AllJunitTests :
chmod +x $@
clean:
- rm -rf $(JAVAROOT)
+ rm -rf $(JAVAROOT)/*
rm -f $(jarfile)
rm -f classnoinst.stamp