diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-04-11 21:47:05 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-04-11 21:47:05 (GMT) |
| commit | afef3c035864297dd2ffe537508164ecb87e89e4 (patch) | |
| tree | caefd3218d14685f69e90ebe2ab5b3fd4e32b0fd /hl | |
| parent | 408471420f13327597fb9c87149bc1bc709f8740 (diff) | |
| download | hdf5-afef3c035864297dd2ffe537508164ecb87e89e4.zip hdf5-afef3c035864297dd2ffe537508164ecb87e89e4.tar.gz hdf5-afef3c035864297dd2ffe537508164ecb87e89e4.tar.bz2 | |
[svn-r10587] Purpose:
Minor feature
Description:
If a user configures without C++ or Fortran, 'make' will not recurse into
c++ or fortran directories. However, if the user cd's into these
directories and 'makes,' the Makefiles will attempt to build interfaces
that have not been configured, usually failing.
In an unrelated but minor change, src/H5detect should be compiled with
the -g flag to disable compiler optimizations since it is only
executed once.
Solution:
Make it harder for users to try to compile interfaces that have not been
configured by making c++, fortran, and hl directories not recurse into
their subdirectories unless they have been configured.
Thus, 'make' in /fortran/src will break if Fortran has not been configured,
but 'make' in /fortran will not break.
Platforms tested:
mir, modi4, copper
Misc. update:
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/Makefile.am | 6 | ||||
| -rwxr-xr-x | hl/Makefile.in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hl/Makefile.am b/hl/Makefile.am index 4e6db6a..1f016b5 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -24,6 +24,10 @@ if BUILD_CXX_CONDITIONAL CXX_DIR = c++ endif -SUBDIRS=src test $(CXX_DIR) $(FORTRAN_DIR) +## Don't recurse into any subdirectories if HDF5 is not configured to +## use the HL library +if BUILD_HDF5_HL_CONDITIONAL + SUBDIRS=src test $(CXX_DIR) $(FORTRAN_DIR) +endif include $(top_srcdir)/config/conclude.am diff --git a/hl/Makefile.in b/hl/Makefile.in index e7b01df..6f5cc45 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -277,7 +277,7 @@ H5FC = $(bindir)/h5fc H5FC_PP = $(bindir)/h5pfc @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran @BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++ -SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR) # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., |