mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

took out ldflags in Makefile.am files

Browse Source
This commit is contained in:
Ed Hartnett 2011-05-11 17:09:12 +00:00
parent efb796ceb2
commit 2f4cf5382e
9 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/C/Makefile.am
View File

@ -21,7 +21,7 @@ simple_xy_nc4_rd
endif #USE_NETCDF4
AM_CPPFLAGS += -I$(top_builddir)/liblib
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la # @EXTERN_LDFLAGS@
check_PROGRAMS = $(TESTPROGRAMS)
TESTS = $(TESTPROGRAMS)

2
h5_test/Makefile.am
View File

@ -44,7 +44,7 @@ TESTS += run_valgrind_tests.sh
endif # USE_VALGRIND_TESTS
# These libraries need to be linked to our tests.
LDADD = -lhdf5_hl -lhdf5 -lz -lm
#LDADD = -lhdf5_hl -lhdf5 -lz -lm
# We must include these files in the distribution.
EXTRA_DIST = run_par_tests.sh run_valgrind_tests.sh \

2
h5_test/tst_h_atts3.c
View File

@ -35,6 +35,7 @@ int
main()
{
printf("\n*** Checking HDF5 attribute functions some more.\n");
#ifdef EXTRA_TESTS
printf("*** Creating tst_xplatform2_3.nc with HDF only...");
{
hid_t fapl_id, fcpl_id;
@ -307,5 +308,6 @@ main()
free(vc_out[i].p);
}
SUMMARIZE_ERR;
#endif /* EXTRA_TESTS */
FINAL_RESULTS;
}

2
h5_test/tst_h_atts4.c
View File

@ -36,6 +36,7 @@ int
main()
{
printf("\n*** Checking HDF5 attribute functions for memory leaks.\n");
#ifdef EXTRA_TESTS
printf("*** Checking vlen of compound file...");
{
#define NUM_OBJ_2 2
@ -180,5 +181,6 @@ main()
free(vc_out);
}
SUMMARIZE_ERR;
#endif /* EXTRA_TESTS */
FINAL_RESULTS;
}

3
h5_test/tst_h_dimscales.c
View File

@ -363,6 +363,7 @@ main()
}
SUMMARIZE_ERR;
#ifdef EXTRA_TESTS
printf("*** Checking that unlimited dimscale file can be read...");
{
@ -780,7 +781,7 @@ main()
}
SUMMARIZE_ERR;
#endif
FINAL_RESULTS;
}

2
libsrc4/Makefile.am
View File

@ -34,7 +34,7 @@ libnetcdf4_la_LIBADD += -lpnetcdf
endif # USE_PNETCDF
# Always link to hdf5_hl, hdf5, and z.
libnetcdf4_la_LIBADD += -lhdf5_hl -lhdf5 -lz
#libnetcdf4_la_LIBADD += -lhdf5_hl -lhdf5 -lz
# This turns on declspec magic in netcdf.h for windows DLLs.
if BUILD_DLL

2
nc_test/Makefile.am
View File

@ -26,7 +26,7 @@ endif
nc_test_SOURCES = nc_test.c error.c test_get.m4 test_put.m4 \
test_read.c test_write.c util.c error.h tests.h
LDADD += ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
LDADD += ${top_builddir}/liblib/libnetcdf.la #@EXTERN_LDFLAGS@
AM_CPPFLAGS += -I$(top_builddir)/liblib
# If the user asked for large file tests, then add them.

2
nc_test4/Makefile.am
View File

@ -9,7 +9,7 @@
include $(top_srcdir)/lib_flags.am
# Link to our assembled library.
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la -lhdf5_hl -lhdf5 -lz
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la # -lhdf5_hl -lhdf5 -lz
# These are netCDF-4 test programs.
NC4_TESTS = tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars \

2
nctest/Makefile.am
View File

@ -7,7 +7,7 @@
# One of the tests needs the math library for some reason.
LDADD = -lm
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/liblib @EXTERN_CPPFLAGS@
AM_LDFLAGS = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
AM_LDFLAGS = ${top_builddir}/liblib/libnetcdf.la # @EXTERN_LDFLAGS@
# Running nctest results in a file testfile.nc, which is then checked
# to make sure it matches testfile_nc.sav, which was generated under