diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-08-01 14:40:01 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-08-01 14:40:01 (GMT) |
| commit | bb8904a75e68c925162e77169a47d4eb2ac00bd3 (patch) | |
| tree | 6b6ee8cfc42f5cf3723cbb76a827f039fd2535f1 /config | |
| parent | 95910889d7ddba29f0343078b8e9b982d3bb974d (diff) | |
| parent | 4227b8948d7091205b4f8dc1271d7dcae01bb0fb (diff) | |
| download | hdf5-bb8904a75e68c925162e77169a47d4eb2ac00bd3.zip hdf5-bb8904a75e68c925162e77169a47d4eb2ac00bd3.tar.gz hdf5-bb8904a75e68c925162e77169a47d4eb2ac00bd3.tar.bz2 | |
Merge pull request #1826 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop
* commit '4227b8948d7091205b4f8dc1271d7dcae01bb0fb':
Reverts the removal of config/conclude_fc.am while keeping the changes to config/gnu-fflags.
Fixed a couple of typos.
Diffstat (limited to 'config')
| -rw-r--r-- | config/conclude.am | 2 | ||||
| -rw-r--r-- | config/conclude_fc.am | 31 | ||||
| -rw-r--r-- | config/gnu-flags | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/config/conclude.am b/config/conclude.am index 2eec03a..58c2934 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -68,7 +68,7 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS) # make install-doc doesn't do anything outside of doc directory, but # Makefiles should recognize it. # UPDATE: docs no longer reside in this build tree, so this target -# is depreciated. +# is deprecated. install-doc uninstall-doc: @echo "Nothing to be done." diff --git a/config/conclude_fc.am b/config/conclude_fc.am new file mode 100644 index 0000000..15d04a7 --- /dev/null +++ b/config/conclude_fc.am @@ -0,0 +1,31 @@ +## config/conclude_fc.am +## (Use double hashes for copyright notice so that automake treats it as +## comments and does not pass it to Makefile.in) +## Copyright by The HDF Group. +## Copyright by the Board of Trustees of the University of Illinois. +## All rights reserved. +## +## This file is part of HDF5. The full HDF5 copyright notice, including +## terms governing use, modification, and redistribution, is contained in +## the COPYING file, which can be found at the root of the source code +## distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +## If you do not have access to either file, you may request a copy from +## help@hdfgroup.org. + + +## Textually included at the end of the Fortran HDF5 Makefiles.am. + +# Makefile.am include fragment with Fortran helper rules and macros. + +# AM_FCCPPFLAGS, FCCPPFLAGS are currently not used. + +PPFCCOMPILE = $(FC) $(FCDEFS) $(DEFAULT_INCLUDES) $(FCINCLUDES) $(AM_FCCPPFLAGS) $(FCCPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS) +LTPPFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(PPFCCOMPILE) + +# Treat all .f90 and .F90 files as preprocessed Fortran. +.f90.o: + $(PPFCCOMPILE) -c -o $@ $< +.F90.o: + $(PPFCCOMPILE) -c -o $@ $< + +include $(top_srcdir)/config/conclude.am diff --git a/config/gnu-flags b/config/gnu-flags index ae8ddb0..6355ccf 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -195,7 +195,7 @@ if test "X-gcc" = "X-$cc_vendor"; then # -Wvolatile-register-var was later incorporated into -Wall and # only needs to be specified explicitly for gcc 4.2-4.3 - if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $$cc_vers_minor -le 3; then + if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $cc_vers_minor -le 3; then H5_CFLAGS="$H5_CFLAGS -Wvolatile-register-var" fi |