mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Continued refactoring.

Browse Source
This commit is contained in:
Ward Fisher 2017-05-31 16:34:46 -06:00
parent ef450c40a0
commit df872ac1bc
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -1438,10 +1438,10 @@ AX_SET_META([NC_HAS_PARALLEL4],[$enable_parallel4],[yes])
abs_top_builddir=`pwd`
cd $srcdir
abs_top_srcdir=`pwd`
#cd $abs_top_builddir
cd $abs_top_builddir
#AC_CONFIG_FILES(test_common.sh.in)
#rm -f ${abs_top_builddir}/test_common.sh
#sed -e "s|@TOPSRCDIR@|${abs_top_srcdir}|" -e "s|@TOPBUILDDIR@|${abs_top_builddir}|" <${abs_top_srcdir}/test_common.in >${abs_top_builddir}/test_common.sh
rm -f ${abs_top_builddir}/test_common.sh
sed -e "s|@TOPSRCDIR@|${abs_top_srcdir}|" -e "s|@TOPBUILDDIR@|${abs_top_builddir}|" <${abs_top_srcdir}/test_common.in >${abs_top_builddir}/test_common.sh
#####
# End netcdf_meta.h definitions.
@ -1451,7 +1451,6 @@ AC_MSG_NOTICE([generating header files and makefiles])
AC_CONFIG_FILES([Makefile
nc-config
netcdf.pc
test_common.sh
libnetcdf.settings
postinstall.sh
include/netcdf_meta.h

6
nc_test4/Makefile.am
View File

@ -135,7 +135,7 @@ run_grp_rename.sh tst_formatx_hdf4.sh run_chunk_hdf4.sh \
tst_h5_endians.c tst_h4_lendian.c tst_atts_string_rewrite.c \
tst_put_vars_two_unlim_dim.c tst_empty_vlen_unlim.c run_empty_vlen_test.sh \
ref_hdf5_compat1.nc ref_hdf5_compat2.nc ref_hdf5_compat3.nc tst_misc.sh \
tdset.h5 tst_hdf4_read_var.sh
tdset.h5 tst_hdf4_read_var.sh contiguous.hdf4 chunked.hdf4
CLEANFILES = tst_mpi_parallel.bin cdm_sea_soundings.nc bm_chunking.nc \
@ -155,6 +155,6 @@ DISTCLEANFILES = AMSR_E_L2_Rain_V10_200905312326_A.hdf \
AMSR_E_L3_DailyLand_V06_20020619.hdf \
MYD29.A2009152.0000.005.2009153124331.hdf \
MYD29.A2002185.0000.005.2007160150627.hdf \
MOD29.A2000055.0005.005.2006267200024.hdf \
contiguous.hdf4 chunked.hdf4
MOD29.A2000055.0005.005.2006267200024.hdf
endif # HDF4_FILE_TESTS

4
test_common.sh.in
View File

@ -1,7 +1,7 @@
set -e
TOPSRCDIR=@abs_top_srcdir@
TOPBUILDDIR=@abs_top_builddir@
TOPSRCDIR=@TOPSRCDIR@
TOPBUILDDIR=@TOPBUILDDIR@
# Figure out various locations in the src/build tree.
# This is relatively fragile code and is essentially