diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-06-12 20:09:51 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-06-12 20:09:51 (GMT) |
| commit | 7e929a9bec66863f1f31721282d1fa459bc486ff (patch) | |
| tree | 1e222e9876e2e7a50ce221d98401be9511302340 /java | |
| parent | 436250369ae18c957c48c30dd328e68b4594dfce (diff) | |
| parent | 6e1dc507240fba447c79827897b099e91b9dd5c1 (diff) | |
| download | hdf5-7e929a9bec66863f1f31721282d1fa459bc486ff.zip hdf5-7e929a9bec66863f1f31721282d1fa459bc486ff.tar.gz hdf5-7e929a9bec66863f1f31721282d1fa459bc486ff.tar.bz2 | |
Merge pull request #1728 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:bugfix/HDFFV-9976-add-configuration-or-make-options to develop
* commit '6e1dc507240fba447c79827897b099e91b9dd5c1':
Add release note for enable-tools and enable-tests options.
Modified Makefile.ams for h5repack, h5watch and gif2h5 to allow disabling tests. Moved h5cc.in from tools/src/misc to src directory to always create h5cc whether or not tools are enabled. Added configuration status of tools and tests to libhdf5.settings.
Add options to enable or disable building tools and tests. The default is enabled for each.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index ed2414d..51398f2 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -23,13 +23,21 @@ include $(top_srcdir)/config/commence.am +if BUILD_TESTS_CONDITIONAL + TESTSERIAL_DIR =test + TESTEXAMPLES_DIR =examples +else + TESTSERIAL_DIR= + TESTEXAMPLES_DIR= +endif + ## Only recurse into subdirectories if the Java (JNI) interface is enabled. if BUILD_JAVA_CONDITIONAL # Mark this directory as part of the JNI API JAVA_API=yes -SUBDIRS=src test examples +SUBDIRS=src $(TESTSERIAL_DIR) $(TESTEXAMPLES_DIR) # Test with just the native connector, with a single pass-through connector # and with a doubly-stacked pass-through. |