moved string.c to libdispatch

Makefile.am

@@ -61,9 +61,6 @@ LIBSRC4_DIR = libsrc4
 NC_TEST4 = nc_test4
 endif
 
-DISPATCHDIR = libdispatch
-ASSEMBLEDIR = liblib
-
 # Does the user want F90 API?
 if BUILD_F90
 F90_DIR = f90
@@ -102,12 +99,10 @@ endif
 
 # This is the list of subdirs for which Makefiles will be constructed
 # and run. ncgen must come before ncdump and cxx, because their tests
-# depend on it. nf_test depends upon ncgen as well. If not using
-# dispatch then NC3DAPDIR must be built right before libsrc and
-# NC4DAPDIR must be built right before LIBSRC4_DIR.
-SUBDIRS = include $(UDUNITS) $(H5_TEST_DIR) $(DISPATCHDIR) $(OCLIB)	\
-libsrc $(LIBSRC4_DIR) $(DAP2) $(LIBCDMR) ${ASSEMBLEDIR} $(V2_TEST)	\
-nc_test $(F90_DIR) $(F77_DIR) $(NCGEN3) $(NCGEN) $(NCDUMP) $(F77_TEST)	\
+# depend on it. nf_test depends upon ncgen as well.
+SUBDIRS = include $(UDUNITS) $(H5_TEST_DIR) libdispatch $(OCLIB)	\
+libsrc $(LIBSRC4_DIR) $(DAP2) $(LIBCDMR) liblib $(V2_TEST) nc_test	\
+$(F90_DIR) $(F77_DIR) $(NCGEN3) $(NCGEN) $(NCDUMP) $(F77_TEST)		\
 ${CXX_DIR} $(CXX4) $(NC_TEST4) $(NCDAPTESTDIR) man4 $(EXAMPLES)		\
 $(LIBCF)
 

include/Makefile.am

@@ -12,4 +12,4 @@ endif
 
 noinst_HEADERS = nc_logging.h nc_tests.h fbits.h nc3dispatch.h nc.h	\
 ncio.h nclist.h nc_uri.h utf8proc.h ncdispatch.h ncdimscale.h		\
-netcdf_f.h err_macros.h ncbytes.h nchashmap.h ceconstraints.h
+netcdf_f.h err_macros.h ncbytes.h nchashmap.h ceconstraints.h rnd.h

include/ncdispatch.h

@@ -21,6 +21,11 @@
 #include "nc.h"
 #include "nc_uri.h"
 
+/* Define uchar if it is not defined on this system. */
+#ifndef HAVE_UCHAR
+typedef unsigned char uchar;
+#endif
+
 static nc_type longtype = (sizeof(long) == sizeof(int) ? NC_INT : NC_INT64);
 
 extern int nc_get_vara_ubyte(int ncid, int varid,

libdispatch/Makefile.am

@@ -17,7 +17,7 @@ libdispatch_la_CPPFLAGS = ${AM_CPPFLAGS}
 # The source files.
 libdispatch_la_SOURCES = parallel.c copy.c file.c dim.c att.c attinq.c	\
 attput.c attget.c error.c var.c varget.c varput.c varinq.c dispatch.c	\
-nc_uri.c nclist.c ncbytes.c nchashmap.c nclog.c nclog.h
+nc_uri.c nclist.c ncbytes.c nchashmap.c nclog.c nclog.h string.c
 
 # Add functions only found in netCDF-4.
 if USE_NETCDF4

libdispatch/string.c

@@ -5,16 +5,15 @@
 /* $Id: string.c,v 1.76 2010/05/26 21:43:33 dmh Exp $ */
 
 #include "config.h"
+#include "ncdispatch.h"
 #include "nc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
-#include "ncx.h"
-#include "rnd.h"
 #include "utf8proc.h"
-
+#include "rnd.h"
 
 /* There are 3 levels of UTF8 checking: 1=> (exact)validating 2=>relaxed
    and 3=>very relaxed

libsrc/Makefile.am

@@ -14,9 +14,9 @@ libnetcdf3_la_CPPFLAGS += -DDLL_EXPORT
 endif # BUILD_DLL
 
 # These files comprise the netCDF-3 classic library code.
-libnetcdf3_la_SOURCES = string.c v1hpg.c onstack.h rnd.h utf8proc.c	\
-utf8proc_data.h nclistmgr.c putget.m4 attr.m4 nc3dispatch.c nc.c var.c	\
-dim.c ncx.m4 ncx.h lookup3.c pstdint.h
+libnetcdf3_la_SOURCES = v1hpg.c onstack.h utf8proc.c utf8proc_data.h	\
+nclistmgr.c putget.m4 attr.m4 nc3dispatch.c nc.c var.c dim.c ncx.m4	\
+ncx.h lookup3.c pstdint.h
 
 # Does the user want to use ffio, a replacement for posixio for Cray
 # computers?

libsrc/ncx.h

@@ -30,12 +30,7 @@
 #include <stddef.h> /* size_t */
 #include <errno.h>
 #include <sys/types.h> /* off_t */
-
-/* Define uchar if it is not defined on this system. */
-#ifndef HAVE_UCHAR
-typedef unsigned char uchar;
-#endif
-
+#include <ncdispatch.h>
 #define longlong long long
 
 #if defined(_CRAY) && !defined(_CRAYIEEE) && !defined(__crayx1)