diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-02-29 02:43:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-02-29 02:43:00 (GMT) |
| commit | 63249be0e10a8726acb5a7cf64491319eaa46227 (patch) | |
| tree | ebb2b75ece8852e8a58804631c0004f06a9bba9f /Makefile.am | |
| parent | a1617b7cdbe14173fcf690b4627059fa4528c19b (diff) | |
| download | hdf5-63249be0e10a8726acb5a7cf64491319eaa46227.zip hdf5-63249be0e10a8726acb5a7cf64491319eaa46227.tar.gz hdf5-63249be0e10a8726acb5a7cf64491319eaa46227.tar.bz2 | |
[svn-r29226] HDFFV-9552: merge in java code.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index c34f2cd..bbab346 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,11 @@ if BUILD_FORTRAN_CONDITIONAL else FORTRAN_DIR= endif +if BUILD_JAVA_CONDITIONAL + JAVA_DIR=java +else + JAVA_DIR= +endif if BUILD_HDF5_HL_CONDITIONAL HDF5_HL_DIR =hl else @@ -73,8 +78,8 @@ else endif SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \ - $(HDF5_HL_DIR) -DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples + $(JAVA_DIR) $(HDF5_HL_DIR) +DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples java # Some files generated during configure that should be cleaned DISTCLEANFILES=config/stamp1 config/stamp2 |