diff options
| author | Dhvanil Popat <dpopat@hdfgroup.org> | 2019-07-16 19:55:41 (GMT) |
|---|---|---|
| committer | Dhvanil Popat <dpopat@hdfgroup.org> | 2019-07-16 19:55:41 (GMT) |
| commit | 6ea31d54b80e8ceaac21a0399117aa4140b919c7 (patch) | |
| tree | 0ed583989920edefdb876cd94864a52ec5573d29 /hl | |
| parent | 2b6e8e76ad8d0312ba9683deb9d7e28cd1748d29 (diff) | |
| download | hdf5-6ea31d54b80e8ceaac21a0399117aa4140b919c7.zip hdf5-6ea31d54b80e8ceaac21a0399117aa4140b919c7.tar.gz hdf5-6ea31d54b80e8ceaac21a0399117aa4140b919c7.tar.bz2 | |
Added options to build tools and tests for HDF5_ 1_8
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/Makefile.am | 13 | ||||
| -rw-r--r-- | hl/c++/Makefile.am | 8 | ||||
| -rw-r--r-- | hl/fortran/Makefile.am | 8 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.am | 12 |
4 files changed, 33 insertions, 8 deletions
diff --git a/hl/Makefile.am b/hl/Makefile.am index aee1f86..0e2fd37 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -32,10 +32,21 @@ if BUILD_CXX_CONDITIONAL CXX_DIR = c++ endif +if BUILD_TESTS_CONDITIONAL + TEST_DIR = test +else + TEST_DIR = +endif +if BUILD_TOOLS_CONDITIONAL + TOOLS_DIR = tools +else + TOOLS_DIR = +endif + ## Don't recurse into any subdirectories if HDF5 is not configured to ## use the HL library if BUILD_HDF5_HL_CONDITIONAL - SUBDIRS=src test tools $(CXX_DIR) $(FORTRAN_DIR) + SUBDIRS=src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR) endif DIST_SUBDIRS=src test tools c++ fortran examples diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am index 1968bf5..f9ea328 100644 --- a/hl/c++/Makefile.am +++ b/hl/c++/Makefile.am @@ -18,7 +18,13 @@ include $(top_srcdir)/config/commence.am -SUBDIRS=src test +if BUILD_TESTS_CONDITIONAL + TESTSERIAL_DIR =test +else + TESTSERIAL_DIR= +endif + +SUBDIRS=src $(TESTSERIAL_DIR) DIST_SUBDIRS=src test examples # Install examples diff --git a/hl/fortran/Makefile.am b/hl/fortran/Makefile.am index ad18a21..7d24770 100644 --- a/hl/fortran/Makefile.am +++ b/hl/fortran/Makefile.am @@ -23,7 +23,13 @@ include $(top_srcdir)/config/commence.am -SUBDIRS=src test +if BUILD_TESTS_CONDITIONAL + TESTSERIAL_DIR =test +else + TESTSERIAL_DIR= +endif + +SUBDIRS=src $(TESTSERIAL_DIR) DIST_SUBDIRS=src test examples # Install examples diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am index d30d66a..9ffde58 100644 --- a/hl/tools/gif2h5/Makefile.am +++ b/hl/tools/gif2h5/Makefile.am @@ -23,11 +23,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/sr # These are our main targets, the tools -TEST_SCRIPT=h52giftest.sh -check_SCRIPTS=$(TEST_SCRIPT) - bin_PROGRAMS=gif2h5 h52gif -noinst_PROGRAMS=h52gifgentst # Add h52gif and gif2h5 specific linker flags here h52gif_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) @@ -37,12 +33,18 @@ gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c h52gif_SOURCES=hdf2gif.c hdfgifwr.c -h52gifgentst_SOURCES=h52gifgentst.c # Programs all depend on the hdf5 library, the tools library, and the HL # library. LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) +if BUILD_TESTS_CONDITIONAL + TEST_SCRIPT=h52giftest.sh + check_SCRIPTS=$(TEST_SCRIPT) + noinst_PROGRAMS=h52gifgentst + h52gifgentst_SOURCES=h52gifgentst.c +endif + CHECK_CLEANFILES+=*.h5 CHECK_CLEANFILES+=*.gif |