Makefile.am (netcdf-fortran-4.4.4) | : | Makefile.am (netcdf-fortran-4.4.5) | ||
---|---|---|---|---|
skipping to change at line 18 | skipping to change at line 18 | |||
AM_LDFLAGS = | AM_LDFLAGS = | |||
BUILT_SOURCES = | BUILT_SOURCES = | |||
libnetcdff_la_SOURCES = | libnetcdff_la_SOURCES = | |||
libnetcdff_la_DEPENDENCIES = | libnetcdff_la_DEPENDENCIES = | |||
EXTRA_DIST = | EXTRA_DIST = | |||
CLEANFILES = | CLEANFILES = | |||
DISTCLEANFILES = | DISTCLEANFILES = | |||
libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-number 6:1:1 | libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-number 6:2:1 | |||
# This, plus either netcdf4.f90 or netcdf.f90, is the main source. | # This, plus either netcdf4.f90 or netcdf.f90, is the main source. | |||
libnetcdff_la_SOURCES += typeSizes.f90 | libnetcdff_la_SOURCES += typeSizes.f90 | |||
if USE_NETCDF4 | if USE_NETCDF4 | |||
NETCDF_O = netcdf4.o | NETCDF_O = netcdf4.o | |||
else | else | |||
NETCDF_O = netcdf.o | NETCDF_O = netcdf.o | |||
endif | endif | |||
skipping to change at line 218 | skipping to change at line 218 | |||
echo '! NetCDF-2.' >> netcdf.inc | echo '! NetCDF-2.' >> netcdf.inc | |||
cat $(top_srcdir)/fortran/netcdf2.inc >> netcdf.inc | cat $(top_srcdir)/fortran/netcdf2.inc >> netcdf.inc | |||
endif | endif | |||
if USE_LOGGING | if USE_LOGGING | |||
echo >> netcdf.inc | echo >> netcdf.inc | |||
echo '! This is to turn on netCDF internal logging.' >> netcdf.inc | echo '! This is to turn on netCDF internal logging.' >> netcdf.inc | |||
echo ' integer nf_set_log_level' >> netcdf.inc | echo ' integer nf_set_log_level' >> netcdf.inc | |||
echo ' external nf_set_log_level' >> netcdf.inc | echo ' external nf_set_log_level' >> netcdf.inc | |||
endif | endif | |||
# The nfconfig.in file is turned into nfconfig.inc by the configure | EXTRA_DIST += netcdf2.inc netcdf3.inc netcdf4.inc | |||
# script. The man page is generated on the developers machine for the dist | ||||
EXTRA_DIST += netcdf.inc netcdf2.inc netcdf3.inc netcdf4.inc | CLEANFILES += netcdf_nc_data.mod netcdf_nc_interfaces.mod \ | |||
netcdf_nf_data.mod netcdf_nf_interfaces.mod \ | ||||
DISTCLEANFILES += nfconfig1.inc nfconfig.inc netcdf.inc | netcdf_fortv2_c_interfaces.mod netcdf_f03.mod \ | |||
netcdf4_nc_interfaces.mod netcdf4_nf_interfaces.mod netcdf4_f03.mod \ | ||||
CLEANFILES += netcdf_nc_data.mod netcdf_nc_interfaces.mod netcdf_nf_data.mod \ | nfconfig.inc netcdf.inc | |||
netcdf_nf_interfaces.mod netcdf_fortv2_c_interfaces.mod \ | ||||
netcdf_f03.mod netcdf4_nc_interfaces.mod \ | ||||
netcdf4_nf_interfaces.mod netcdf4_f03.mod | ||||
CLEANFILES += $(UCHEADERS) $(UCCOMMON) $(LCHEADERS) $(LCCOMMON) | CLEANFILES += $(UCHEADERS) $(UCCOMMON) $(LCHEADERS) $(LCCOMMON) | |||
# Turn off parallel builds in this directory. | # Turn off parallel builds in this directory. | |||
.NOTPARALLEL: | .NOTPARALLEL: | |||
End of changes. 2 change blocks. | ||||
11 lines changed or deleted | 8 lines changed or added |