diff options
Diffstat (limited to 'hl')
-rw-r--r-- | hl/CMakeLists.txt | 12 | ||||
-rw-r--r-- | hl/Makefile.am | 7 | ||||
-rw-r--r-- | hl/Makefile.in | 6 | ||||
-rw-r--r-- | hl/c++/Makefile.am | 2 | ||||
-rw-r--r-- | hl/c++/Makefile.in | 3 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 1 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 1 | ||||
-rw-r--r-- | hl/c++/test/Makefile.in | 1 | ||||
-rw-r--r-- | hl/examples/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 1 | ||||
-rw-r--r-- | hl/fortran/test/Makefile.in | 1 | ||||
-rw-r--r-- | hl/src/Makefile.in | 1 | ||||
-rw-r--r-- | hl/test/Makefile.in | 1 | ||||
-rw-r--r-- | hl/tools/Makefile.in | 1 | ||||
-rw-r--r-- | hl/tools/gif2h5/Makefile.in | 1 |
17 files changed, 34 insertions, 8 deletions
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt index 083c60e..5061c6c 100644 --- a/hl/CMakeLists.txt +++ b/hl/CMakeLists.txt @@ -7,9 +7,17 @@ project (HDF5_HL C) add_subdirectory (src) -#-- Build the High level Tools +# Build HDF5 Tools if (HDF5_BUILD_TOOLS) - add_subdirectory (tools) + #----------------------------------------------------------------------------- + #-- Option to build the High level Tools + #----------------------------------------------------------------------------- + if (EXISTS "${HDF5_HL_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_HL_SOURCE_DIR}/tools") + option (HDF5_BUILD_HL_TOOLS "Build HDF5 HL Tools" ON) + if (HDF5_BUILD_HL_TOOLS) + add_subdirectory (tools) + endif () + endif () endif () #-- Add High Level Examples diff --git a/hl/Makefile.am b/hl/Makefile.am index 4e57228..8c427d3 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -10,7 +10,7 @@ # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # -# +# # This makefile mostly just reinvokes make in the various subdirectories # but does so in the correct order. You can alternatively invoke make from # each subdirectory manually. @@ -31,17 +31,20 @@ endif if BUILD_CXX_CONDITIONAL CXX_DIR = c++ endif - if BUILD_TESTS_CONDITIONAL TEST_DIR = test else TEST_DIR = endif if BUILD_TOOLS_CONDITIONAL +if BUILD_TOOLS_HL_CONDITIONAL TOOLS_DIR = tools else TOOLS_DIR = endif +else + TOOLS_DIR = +endif ## Don't recurse into any subdirectories if HDF5 is not configured to ## use the HL library diff --git a/hl/Makefile.in b/hl/Makefile.in index 6166533..6cdb0afd 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -26,7 +26,7 @@ # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # -# +# # This makefile mostly just reinvokes make in the various subdirectories # but does so in the correct order. You can alternatively invoke make from # each subdirectory manually. @@ -493,6 +493,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ @@ -685,7 +686,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_TESTS_CONDITIONAL_FALSE@TEST_DIR = @BUILD_TESTS_CONDITIONAL_TRUE@TEST_DIR = test @BUILD_TOOLS_CONDITIONAL_FALSE@TOOLS_DIR = -@BUILD_TOOLS_CONDITIONAL_TRUE@TOOLS_DIR = tools +@BUILD_TOOLS_CONDITIONAL_TRUE@@BUILD_TOOLS_HL_CONDITIONAL_FALSE@TOOLS_DIR = +@BUILD_TOOLS_CONDITIONAL_TRUE@@BUILD_TOOLS_HL_CONDITIONAL_TRUE@TOOLS_DIR = tools @BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR) DIST_SUBDIRS = src test tools c++ fortran examples diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am index 0c0f97e..a2465b7 100644 --- a/hl/c++/Makefile.am +++ b/hl/c++/Makefile.am @@ -14,7 +14,7 @@ ## Run automake to generate a Makefile.in from this file. # # High-Level API C++ Makefile(.in) -# +# include $(top_srcdir)/config/commence.am diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index a152115..54343ad 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -27,7 +27,7 @@ # help@hdfgroup.org. # # High-Level API C++ Makefile(.in) -# +# VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index e2daf43..b4bd192 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -436,6 +436,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 08cc122..41be875 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -492,6 +492,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 3025729..e1b613c 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 8341e54..5d62060 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -436,6 +436,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index b0c494e..199e23e 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -493,6 +493,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index e7ffc85..d8e64c6 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -437,6 +437,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 0c32660..5513947 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -510,6 +510,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 5074d5e..f15e8f0 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -501,6 +501,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 85c2ea4..e70abef 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -491,6 +491,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index cb10c07..ce84a5c 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -527,6 +527,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 9f81530..2754292 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -490,6 +490,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 9f27702..c1070d6 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -505,6 +505,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ +HL_TOOLS = @HL_TOOLS@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ |