mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1826 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop

Browse Source 
* commit '4227b8948d7091205b4f8dc1271d7dcae01bb0fb':
  Reverts the removal of config/conclude_fc.am while keeping the changes to config/gnu-fflags.
  Fixed a couple of typos.
This commit is contained in:
Dana Robinson 2019-08-01 09:40:01 -05:00
commit bb8904a75e
11 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -119,6 +119,7 @@
./config/cce-flags
./config/commence.am
./config/conclude.am
./config/conclude_fc.am
./config/examples.am
./config/freebsd
./config/gnu-cxxflags

2
config/conclude.am
View File

@ -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."

31
config/conclude_fc.am Normal file
View File

@ -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

2
config/gnu-flags
View File

@ -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

2
fortran/examples/Makefile.am
View File

@ -105,4 +105,4 @@ compound_fortran2003: compound_fortran2003.f90
compound_complex_fortran2003: compound_complex_fortran2003.f90
include $(top_srcdir)/config/examples.am
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am

2
fortran/src/Makefile.am
View File

@ -165,4 +165,4 @@ HDF5.lo: $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo \
H5Off.lo H5Pff.lo H5Rff.lo \
H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am

2
fortran/test/Makefile.am
View File

@ -100,4 +100,4 @@ H5_test_buildiface_LDADD =
fflush2.chkexe_: fflush1.chkexe_
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am

2
fortran/testpar/Makefile.am
View File

@ -48,4 +48,4 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
# Mark this directory as part of the Fortran API
FORTRAN_API=yes
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am

2
hl/fortran/examples/Makefile.am
View File

@ -62,4 +62,4 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
# and fortran libraries above.
include $(top_srcdir)/config/examples.am
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am

3
hl/fortran/src/Makefile.am
View File

@ -114,5 +114,4 @@ H5IMff.lo: $(srcdir)/H5IMff.F90
H5TBff.lo: $(srcdir)/H5TBff.F90
H5LTff_gen.lo: H5LTff.lo H5LTff_gen.F90
H5TBff_gen.lo: H5TBff.lo H5LTff_gen.F90 H5TBff_gen.F90
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am

2
hl/fortran/test/Makefile.am
View File

@ -62,4 +62,4 @@ clean-local:
# from tests in conclude.am)
FORTRAN_API=yes
include $(top_srcdir)/config/conclude.am
include $(top_srcdir)/config/conclude_fc.am