diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-03-17 16:47:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-03-17 16:47:21 (GMT) |
| commit | b8e163a84563fa9d960f41a64aee785f96f40300 (patch) | |
| tree | 2accc88d57c054ebec37fa67b6fe9cecb53fc55f /java/examples | |
| parent | 83acb60e39943fe7e4772194cbdf491d4d3e86d1 (diff) | |
| download | hdf5-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.
Diffstat (limited to 'java/examples')
| -rw-r--r-- | java/examples/datasets/Makefile.am | 6 | ||||
| -rw-r--r-- | java/examples/datatypes/Makefile.am | 6 | ||||
| -rw-r--r-- | java/examples/groups/Makefile.am | 6 | ||||
| -rw-r--r-- | java/examples/intro/Makefile.am | 6 |
4 files changed, 12 insertions, 12 deletions
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 |