From 9b0192fe94c05ab2080b547115d0016b92fb558c Mon Sep 17 00:00:00 2001
From: Ed Hartnett <edwardjameshartnett@gmail.com>
Date: Thu, 19 Jul 2018 07:26:27 -0600
Subject: [PATCH] moved memfile code to libhdf5
---
libhdf5/CMakeLists.txt | 2 +-
libhdf5/Makefile.am | 2 +-
{libsrc4 => libhdf5}/nc4mem.c | 0
{libsrc4 => libhdf5}/nc4memcb.c | 0
libsrc4/CMakeLists.txt | 2 +-
libsrc4/Makefile.am | 2 +-
6 files changed, 4 insertions(+), 4 deletions(-)
rename {libsrc4 => libhdf5}/nc4mem.c (100%)
rename {libsrc4 => libhdf5}/nc4memcb.c (100%)
diff --git a/libhdf5/CMakeLists.txt b/libhdf5/CMakeLists.txt
index bfeb8d0ef..b04150f58 100644
--- a/libhdf5/CMakeLists.txt
+++ b/libhdf5/CMakeLists.txt
@@ -8,7 +8,7 @@
# The source files for the HDF5 dispatch layer.
SET(libnchdf5_SOURCES nc4hdf.c nc4info.c hdf5file.c hdf5attr.c
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c
-hdf5var.c)
+hdf5var.c nc4mem.c nc4memcb.c)
# Build the HDF4 dispatch layer as a library that will be included in
# the netCDF library.
diff --git a/libhdf5/Makefile.am b/libhdf5/Makefile.am
index 645db023e..c7cb43444 100644
--- a/libhdf5/Makefile.am
+++ b/libhdf5/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES = libnchdf5.la
# The source files.
libnchdf5_la_SOURCES = nc4hdf.c nc4info.c hdf5file.c hdf5attr.c \
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c \
-hdf5var.c
+hdf5var.c nc4mem.c nc4memcb.c
# Package this for cmake build.
EXTRA_DIST = CMakeLists.txt
diff --git a/libsrc4/nc4mem.c b/libhdf5/nc4mem.c
similarity index 100%
rename from libsrc4/nc4mem.c
rename to libhdf5/nc4mem.c
diff --git a/libsrc4/nc4memcb.c b/libhdf5/nc4memcb.c
similarity index 100%
rename from libsrc4/nc4memcb.c
rename to libhdf5/nc4memcb.c
diff --git a/libsrc4/CMakeLists.txt b/libsrc4/CMakeLists.txt
index a6dd5d63f..f54d652c3 100644
--- a/libsrc4/CMakeLists.txt
+++ b/libsrc4/CMakeLists.txt
@@ -1,6 +1,6 @@
# Process these files with m4.
-SET(libsrc4_SOURCES nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c ncindex.c nc4mem.c nc4memcb.c )
+SET(libsrc4_SOURCES nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c ncindex.c )
IF(LOGGING)
SET(libsrc4_SOURCES ${libsrc4_SOURCES} error4.c)
diff --git a/libsrc4/Makefile.am b/libsrc4/Makefile.am
index f60b30dc3..0c59d6ae8 100644
--- a/libsrc4/Makefile.am
+++ b/libsrc4/Makefile.am
@@ -12,7 +12,7 @@ libnetcdf4_la_CPPFLAGS = ${AM_CPPFLAGS}
noinst_LTLIBRARIES = libnetcdf4.la
libnetcdf4_la_SOURCES = nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c \
nc4internal.c nc4type.c nc4var.c ncfunc.c error4.c nc4printer.c \
-ncindex.c nc4mem.c nc4memcb.c
+ncindex.c
EXTRA_DIST = CMakeLists.txt