mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed diskless files for non-netcdf-4 builds

Browse Source
This commit is contained in:
Ed Hartnett 2011-08-23 15:07:24 +00:00
parent 611253763c
commit fde5e75730
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -39,6 +39,7 @@ if USE_NETCDF4
H5_TEST_DIR = h5_test
LIBSRC4_DIR = libsrc4
NC_TEST4 = nc_test4
LIBDISKLESS = libdiskless
endif
# Build the opendap client?
@ -61,7 +62,7 @@ endif
# and run. ncgen must come before ncdump, because their tests
# depend on it.
SUBDIRS = include $(H5_TEST_DIR) libdispatch $(OCLIB) libsrc \
libdiskless $(LIBSRC4_DIR) $(DAP2) $(LIBCDMR) liblib $(V2_TEST) \
$(LIBDISKLESS) $(LIBSRC4_DIR) $(DAP2) $(LIBCDMR) liblib $(V2_TEST) \
nc_test $(NCGEN3) $(NCGEN) $(NCDUMP) $(NC_TEST4) $(NCDAPTESTDIR) man4 \
$(EXAMPLES)

10
liblib/Makefile.am
View File

@ -28,11 +28,10 @@ if BUILD_V2
libnetcdf_la_LIBADD += ${top_builddir}/libdispatch/libnetcdf2.la
endif # BUILD_V2
# The output library will always include netcdf3, diskless, and
# dispatch libraries.
# The output library will always include netcdf3 and dispatch
# libraries.
libnetcdf_la_LIBADD += ${top_builddir}/libdispatch/libdispatch.la \
${top_builddir}/libsrc/libnetcdf3.la \
${top_builddir}/libdiskless/libdiskless.la
${top_builddir}/libsrc/libnetcdf3.la
# netcdf3 + dap
if USE_DAP
@ -45,7 +44,8 @@ endif # USE_DAP
if USE_NETCDF4
AM_CPPFLAGS += -I${top_srcdir}/libsrc4
libnetcdf_la_LIBADD += ${top_builddir}/libsrc4/libnetcdf4.la
libnetcdf_la_LIBADD += ${top_builddir}/libdiskless/libdiskless.la \
${top_builddir}/libsrc4/libnetcdf4.la
# netcdf4+cdmremote
if BUILD_CDMREMOTE

5
liblib/stub.c
View File

@ -3,9 +3,6 @@
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/
/* $Id: stub.c,v 1.8 2010/05/25 13:53:02 ed Exp $ */
/* $Header: /upc/share/CVS/netcdf-3/liblib/stub.c,v 1.8 2010/05/25 13:53:02 ed Exp $ */
#include "config.h"
#include "ncdispatch.h"
@ -31,9 +28,9 @@ NC_initialize(void)
int stat = NC_NOERR;
if((stat = NC3_initialize())) return stat;
if((stat = NCD_initialize())) return stat;
#ifdef USE_NETCDF4
if((stat = NCD_initialize())) return stat;
if((stat = NC4_initialize())) return stat;
#endif

4
nc_test/Makefile.am
View File

@ -12,8 +12,8 @@ CLEANFILES = nc_test_classic.nc nc_test_64bit.nc nc_test_netcdf4.nc \
tst_*.nc t_nc.nc large_files.nc quick_large_files.nc
# These are the tests which are always run.
TESTPROGRAMS = t_nc tst_small nc_test tst_misc tst_diskless tst_norm \
tst_names tst_nofill tst_nofill2 tst_nofill3
TESTPROGRAMS = t_nc tst_small nc_test tst_misc tst_norm tst_names \
tst_nofill tst_nofill2 tst_nofill3
if USE_NETCDF4
TESTPROGRAMS += tst_atts

2
nc_test4/Makefile.am
View File

@ -20,7 +20,7 @@ tst_enums tst_coords tst_coords2 tst_coords3 tst_vars3 tst_vars4 \
tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug \
tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts \
t_type cdm_sea_soundings tst_camrun tst_vl tst_atts1 tst_atts2 \
tst_vars2 tst_files5 tst_files6 tst_sync
tst_vars2 tst_files5 tst_files6 tst_sync tst_diskless
check_PROGRAMS = $(NC4_TESTS)

0
nc_test/tst_diskless.c → nc_test4/tst_diskless.c
View File