mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-19 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

more changes for mingw/DLL builds

Browse Source
This commit is contained in:
Ed Hartnett 2011-05-11 19:51:11 +00:00
parent 2f4cf5382e
commit 8d99e0b43a
11 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cxx/Makefile.am
View File

@ -61,7 +61,7 @@ endif
endif
AM_CPPFLAGS += -I${top_srcdir}/liblib
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la # @EXTERN_LDFLAGS@
LDADD = $(top_builddir)/cxx/libnetcdf_c++.la ${AM_LDFLAGS}
# These headers will be installed in the users header directory.

2
examples/CXX/Makefile.am
View File

@ -13,7 +13,7 @@ LDADD =
AM_CPPFLAGS += -I$(top_builddir)/liblib
AM_CXXFLAGS += -I$(top_builddir)/liblib
AM_LDFLAGS += ${top_builddir}/cxx/libnetcdf_c++.la ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
AM_LDFLAGS += ${top_builddir}/cxx/libnetcdf_c++.la ${top_builddir}/liblib/libnetcdf.la # @EXTERN_LDFLAGS@
# These are the example programs.
TESTPROGRAMS = simple_xy_wr simple_xy_rd sfc_pres_temp_wr \

6
h5_test/tst_h_files.c
View File

@ -34,6 +34,9 @@ main()
H5T_class_t class;
size_t type_size;
int j, k;
hid_t tmp1;
H5open();
/* Initialize some data. */
for (j = 0; j < DIM_LEN; j++)
@ -42,7 +45,8 @@ main()
/* Set the access list so that closes will fail if something is
* still open in the file. */
if ((access_plist = H5Pcreate(H5P_FILE_ACCESS)) < 0) ERR;
tmp1 = H5P_FILE_ACCESS;
if ((access_plist = H5Pcreate(tmp1)) < 0) ERR;
if (H5Pset_fclose_degree(access_plist, H5F_CLOSE_SEMI)) ERR;
/* Create file. */

2
libsrc4/Makefile.am
View File

@ -7,8 +7,6 @@
include $(top_srcdir)/lib_flags.am
# Initialize
LDADD =
libnetcdf4_la_CPPFLAGS = ${AM_CPPFLAGS}
# Netcdf-4 source.

2
ncdump/Makefile.am
View File

@ -6,7 +6,7 @@
# Put together AM_CPPFLAGS and AM_LDFLAGS.
include $(top_srcdir)/lib_flags.am
LDADD = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
LDADD = ${top_builddir}/liblib/libnetcdf.la #@EXTERN_LDFLAGS@
# This is the program we're building, and it's sources.
bin_PROGRAMS = ncdump

1
ncdump/nccopy.c
View File

@ -1194,3 +1194,4 @@ main(int argc, char**argv)
exit(1);
return 0;
}
END_OF_MAIN();

1
ncdump/ncdump.c
View File

@ -2189,3 +2189,4 @@ main(int argc, char *argv[])
return EXIT_SUCCESS;
#endif
}
END_OF_MAIN();

2
ncgen/Makefile.am
View File

@ -4,7 +4,7 @@
# Put together AM_CPPFLAGS and AM_LDFLAGS.
include $(top_srcdir)/lib_flags.am
LDADD = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
LDADD = ${top_builddir}/liblib/libnetcdf.la
# Build ncgen from the listed sources.
bin_PROGRAMS = ncgen

1
ncgen/main.c
View File

@ -376,6 +376,7 @@ main(
return 0;
}
END_OF_MAIN();
void
init_netcdf(void) /* initialize global counts, flags */

2
ncgen3/Makefile.am
View File

@ -6,7 +6,7 @@
include $(top_srcdir)/lib_flags.am
# Link to the netCDF library.
LDADD = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
ncgen3_LDADD = ${top_builddir}/liblib/libnetcdf.la
# Build ncgen from the listed sources.
bin_PROGRAMS = ncgen3

1
ncgen3/main.c
View File

@ -233,3 +233,4 @@ main(
return 1;
return 0;
}
END_OF_MAIN();