more progress

common/src/libncarg_c/Makefile.am

@@ -4,11 +4,11 @@
 # Build this convenience library.
 lib_LTLIBRARIES = libncarg_c.la
 
-# Sources for convenience library.
-libncarg_c_la_SOURCES = sbytes.f gbytes.f bcopyswap.c logic32.c		\
-options.c misc.c ncarg_path.c version.c error.c atoargv.c usleep.c	\
-env.c trnspprt.c lblank.f mangle.c iargct.f rwchinfl.c sdbm.c		\
-i1mach.f r1mach.f d1mach.f
+# Sources for library.
+libncarg_c_la_SOURCES = argget.f sbytes.f gbytes.f bcopyswap.c		\
+logic32.c options.c misc.c ncarg_path.c version.c error.c atoargv.c	\
+usleep.c env.c trnspprt.c lblank.f mangle.c iargct.f rwchinfl.c		\
+sdbm.c i1mach.f r1mach.f d1mach.f
 
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
@@ -19,4 +19,8 @@ noinst_HEADERS = options.h ncarg_path.h
 
 include_HEADERS = c.h
 
-EXTRA_DIST = c.h.in ncarg_path.c.in
+argget.f:argget.f.sed
+	cp $< $*.F
+	$(CPP) $(CPPFLAGS) -o $@ $*.F
+
+EXTRA_DIST = c.h.in ncarg_path.c.in argget.f.sed

ncarg2d/src/db/ezmap/Makefile.am

@@ -2,7 +2,6 @@
 # Ed Hartnett 9/1/18
 
 LDADD = ${top_builddir}/common/src/libncarg_c/libncarg_c.la
-LDADD += ${top_builddir}/ncarg2d/src/libncarg/libncarg.la
 
 bin_PROGRAMS = ConvertMapData WriteLineFile WriteNameFile
 

ni/src/ncl/Makefile.am

@@ -3,23 +3,38 @@
 
 # bin_PROGRAMS = ncl
 
-# ncl_SOURCES = AddBuiltIns.c AddFileFormats.c AddHLUObjs.c		\
-# AddIntrinsics.c AdvancedFileSupport.c AttSupport.c BuiltInFuncs.c	\
-# BuiltInSupport.c complete.c craybin.c ctoiee.c DataSupport.c date.c	\
-# editline.c Execute.c FileSupport.c Formats.c GetGrids.c guiFuncs.c	\
-# h5reader.c h5writer.c HLUFunctions.c HLUSupport.c hphack.c InitData.c	\
-# io.c javaAddFuncs.c javaAddProto.c ListSupport.c Machine.c Memory.c	\
-# NclAdvancedFile.c NclAdvancedGroup.c NclAdvancedOGR.c NclApi.c		\
-# NclAtt.c Ncl.c NclCCM.c NclCoordVar.c NclData.c NclDriver.c NclFile.c	\
-# NclFileVar.c NclGRIB2.c NclGRIB.c NclGroup.c NclHDF5.c NclHDF.c		\
-# NclHDFEOS5.c NclHDFEOS.c NclHLUObj.c NclHLUVar.c NclList.c		\
-# NclMultiDValHLUObjData.c NclMultiDVallistData.c				\
-# NclMultiDValnclfileData.c NclNetCDF4.c NclNetCdf.c NclNewHDF5.c		\
-# NclNewHDFEOS5.c NclOGR.c NclOneDValCoordData.c NclProf.c NclTime.c	\
-# NclType.c NclTypelist.c NclUserFileFormStub.c NclUserFuncStub.c		\
-# NclUserHLUStub.c NclVar.c openclAddFuncs.c openclAddProto.c		\
-# OpsFuncs.c PrintToken.c SrcTree.c subprocess.c Symbol.c sysunix.c	\
-# Translate.c userAddFuncs.c userAddProto.c VarSupport.c yywrap.c
+.NOTPARALLEL:
+
+CREATED_FILES = parser.h TypeSupport.h TypeSupport.c			\
+NclMultiDValData.c MathFuncs.c MathFuncs.h NclTypedouble.h		\
+NclTypedouble.c NclTypefloat.h NclTypefloat.c NclTypeint.h		\
+NclTypeint.c NclTypelong.h NclTypelong.c NclTypeshort.h			\
+NclTypeshort.c NclTypelogical.h NclTypelogical.c NclTypestring.h	\
+NclTypestring.c NclTypeobj.h NclTypeobj.c NclTypechar.h NclTypechar.c	\
+NclTypebyte.h NclTypebyte.c NclTypeint64.h NclTypeint64.c		\
+NclTypeushort.h NclTypeushort.c NclTypeuint.h NclTypeuint.c		\
+NclTypeulong.h NclTypeulong.c NclTypeuint64.h NclTypeuint64.c		\
+NclTypeubyte.h NclTypeubyte.c
+
+AddBuiltIns.c: $(CREATED_FILES)
+
+ncl_SOURCES = AddBuiltIns.c AddFileFormats.c AddHLUObjs.c		\
+AddIntrinsics.c AdvancedFileSupport.c AttSupport.c BuiltInFuncs.c	\
+BuiltInSupport.c complete.c craybin.c ctoiee.c DataSupport.c date.c	\
+editline.c Execute.c FileSupport.c Formats.c GetGrids.c guiFuncs.c	\
+h5reader.c h5writer.c HLUFunctions.c HLUSupport.c hphack.c InitData.c	\
+io.c javaAddFuncs.c javaAddProto.c ListSupport.c Machine.c Memory.c	\
+NclAdvancedFile.c NclAdvancedGroup.c NclAdvancedOGR.c NclApi.c		\
+NclAtt.c Ncl.c NclCCM.c NclCoordVar.c NclData.c NclDriver.c NclFile.c	\
+NclFileVar.c NclGRIB2.c NclGRIB.c NclGroup.c NclHDF5.c NclHDF.c		\
+NclHDFEOS5.c NclHDFEOS.c NclHLUObj.c NclHLUVar.c NclList.c		\
+NclMultiDValHLUObjData.c NclMultiDVallistData.c				\
+NclMultiDValnclfileData.c NclNetCDF4.c NclNetCdf.c NclNewHDF5.c		\
+NclNewHDFEOS5.c NclOGR.c NclOneDValCoordData.c NclProf.c NclTime.c	\
+NclType.c NclTypelist.c NclUserFileFormStub.c NclUserFuncStub.c		\
+NclUserHLUStub.c NclVar.c openclAddFuncs.c openclAddProto.c		\
+OpsFuncs.c PrintToken.c SrcTree.c subprocess.c Symbol.c sysunix.c	\
+Translate.c userAddFuncs.c userAddProto.c VarSupport.c yywrap.c
 
 include_HEADERS = AdvancedFileSupport.h ApiRecords.h AttSupport.h	\
 ccmhdr.h cptec_254_gtb.h DataSupport.h date.h defs.h dwd_002_gtb.h	\
@@ -50,3 +65,191 @@ NclMultiDVallistData.h NclMultiDValnclfileData.h			\
 NclOneDValCoordData.h NclOptions.h NclProf.h NclType.h NclTypelist.h	\
 NclVar.h OpsFuncs.h OpsList.h SrcTree.h Symbol.h tables.h		\
 VarSupport.h
+
+SHELL = /bin/sh
+CP = cp
+NUM_OP_TMPL = TypeDivOpTemplate.c.sed TypeFunctionOpTemplate.c.sed	\
+TypeMatMulOpTemplate.c.sed TypeIsMonoFunc.c.sed				\
+TypeMonoOpTemplate.c.sed TypeResetMissing.c.sed				\
+TypeSelectOpTemplate.c.sed TypeSimpleOpTemplate.c.sed			\
+TypeXorOpTemplate.c.sed TypeInitClassTemplate.c.sed NclType.c.sed	\
+NclType.h.sed TypeAndOpTemplate.c.sed TypeOrOpTemplate.c.sed
+STR_OP_TMPL = TypestringCompareOpTemplate.c.sed			\
+TypestringSelectOpTemplate.c.sed TypeInitClassTemplate.c.sed	\
+NclTypestring.c.sed
+FILE_OP_TMPL = NclMultiDValData.c.sed MultiDValOp.c.sed
+
+ioapi.o : io.c
+	$(CP) io.c ioapi.c
+#	$(CC) -c $(API_DEFS) $(CFLAGS) io.c -o ioapi.o
+
+NclHLUObjapi.o : NclHLUObj.c
+	$(CC) -c $(API_DEFS) $(CFLAGS) NclHLUObj.c -o NclHLUObjapi.o
+
+scanapi.c: scanner.c
+	$(CP) scanner.c scanapi.c
+
+# scanapi.o: scanapi.c
+# 	$(CC) -c $(API_DEFS) $(CFLAGS) $<
+
+parseapi.c: parser.c
+	$(CP) parser.c parseapi.c
+
+# parseapi.o: parseapi.c
+# 	$(CC) -c $(API_DEFS) $(CFLAGS) $<
+
+scanner.c:	lex.yy.c
+	$(CP) lex.yy.c scanner.c
+
+parser.h:	y.tab.h
+	$(CP) y.tab.h parser.h
+
+parser.c:	y.tab.c
+	$(CP) y.tab.c parser.c
+
+lex.yy.c: ncl.l
+	$(LEX) ncl.l
+
+y.tab.c y.tab.h: ncl.y
+	$(YACC) -d -t ncl.y
+
+TypeSupport.h: TypeSupport.h.sed TypeSupportMatTemplate.h.sed TypeSupportOpTemplate.h.sed TypeSupportMonoOpTemplate.h.sed
+	$(SHELL) type_support_h.sh
+
+TypeSupport.c: TypeSupport.c.sed TypeSupportMatTemplate.c.sed TypeSupportOpTemplate.c.sed TypeSupportMonoOpTemplate.c.sed
+	$(SHELL) type_support_c.sh
+
+NclMultiDValData.c: NclMultiDValData.c.sed MultiDValOp.c.sed NclMultiDValData.h math_funcs.sh MatMulDValOp.c.sed
+	$(SHELL) multid_data_c.sh
+
+MathFuncs.c: MathFuncs.c.sed MathFuncs.h.sed MathTemplate.c.sed MathTemplate.h.sed math_funcs.sh
+	$(SHELL) math_funcs.sh
+
+MathFuncs.h: MathFuncs.c.sed MathFuncs.h.sed MathTemplate2.c.sed MathTemplate.c.sed MathTemplate.h.sed math_funcs.sh
+	$(SHELL) math_funcs.sh
+
+NclTypedouble.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh double
+
+NclTypedouble.c:	double_data_c.sh op_funcs.sh NclTypedouble.c.specific $(NUM_OP_TMPL)
+	$(SHELL) double_data_c.sh
+
+NclTypefloat.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh float
+
+NclTypefloat.c:	float_data_c.sh op_funcs.sh NclTypefloat.c.specific $(NUM_OP_TMPL)
+	$(SHELL) float_data_c.sh
+
+NclTypeint.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh int
+
+NclTypeint.c:	int_data_c.sh op_funcs.sh NclTypeint.c.specific $(NUM_OP_TMPL)
+	$(SHELL) int_data_c.sh
+
+NclTypelong.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh long
+
+NclTypelong.c:	long_data_c.sh op_funcs.sh NclTypelong.c.specific $(NUM_OP_TMPL)
+	$(SHELL) long_data_c.sh
+
+NclTypeshort.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh short
+
+NclTypeshort.c:	short_data_c.sh op_funcs.sh NclTypeshort.c.specific $(NUM_OP_TMPL)
+	$(SHELL) short_data_c.sh
+
+NclTypelogical.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh logical
+
+NclTypelogical.c:	logical_data_c.sh op_funcs.sh NclTypelogical.c.specific $(NUM_OP_TMPL)
+	$(SHELL) logical_data_c.sh
+
+NclTypestring.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh string
+
+NclTypestring.c:	string_data_c.sh op_funcs.sh NclTypestring.c.specific $(STR_OP_TMPL)
+	$(SHELL) string_data_c.sh
+
+NclTypeobj.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh obj
+
+NclTypeobj.c:	obj_data_c.sh op_funcs.sh NclTypeobj.c.specific $(NUM_OP_TMPL)
+	$(SHELL) obj_data_c.sh
+
+NclTypechar.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh char
+
+NclTypechar.c:	char_data_c.sh op_funcs.sh NclTypechar.c.specific $(NUM_OP_TMPL)
+	$(SHELL) char_data_c.sh
+
+NclTypebyte.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh byte
+
+NclTypebyte.c:	byte_data_c.sh op_funcs.sh NclTypebyte.c.specific $(NUM_OP_TMPL)
+	$(SHELL) byte_data_c.sh
+
+NclTypeint64.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh int64
+
+NclTypeint64.c:	int64_data_c.sh op_funcs.sh NclTypeint64.c.specific $(NUM_OP_TMPL)
+	$(SHELL) int64_data_c.sh
+
+NclTypeushort.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh ushort
+
+NclTypeushort.c:	ushort_data_c.sh op_funcs.sh NclTypeushort.c.specific $(NUM_OP_TMPL)
+	$(SHELL) ushort_data_c.sh
+
+NclTypeuint.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh uint
+
+NclTypeuint.c:	uint_data_c.sh op_funcs.sh NclTypeuint.c.specific $(NUM_OP_TMPL)
+	$(SHELL) uint_data_c.sh
+
+NclTypeulong.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh ulong
+
+NclTypeulong.c:	ulong_data_c.sh op_funcs.sh NclTypeulong.c.specific $(NUM_OP_TMPL)
+	$(SHELL) ulong_data_c.sh
+
+NclTypeuint64.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh uint64
+
+NclTypeuint64.c:	uint64_data_c.sh op_funcs.sh NclTypeuint64.c.specific $(NUM_OP_TMPL)
+	$(SHELL) uint64_data_c.sh
+
+NclTypeubyte.h:	data_h.sh NclType.h.sed
+	$(SHELL) data_h.sh ubyte
+
+NclTypeubyte.c:	ubyte_data_c.sh op_funcs.sh NclTypeubyte.c.specific $(NUM_OP_TMPL)
+	$(SHELL) ubyte_data_c.sh
+
+EXTRA_DIST = MathFuncs.c.sed MathFuncs.h.sed MathTemplate2.c.sed	\
+MathTemplate.c.sed MathTemplate.h.sed MatMulDValOp.c.sed		\
+MultiDValOp.c.sed NclMultiDValData.c.sed NclMultiDValData.h.sed		\
+NclType.c.sed NclType.h.sed NclTypestring.c.sed nio_path.c.sed		\
+TypeAndOpTemplate.c.sed TypeDivOpTemplate.c.sed				\
+TypeFunctionOpTemplate.c.sed TypeInitClassTemplate.c.sed		\
+TypeIsMonoFunc.c.sed TypeMatMulOpTemplate.c.sed				\
+TypeMonoOpTemplate.c.sed TypeOrOpTemplate.c.sed				\
+TypeResetMissing.c.sed TypeSelectOpTemplate.c.sed			\
+TypeSimpleOpTemplate.c.sed TypestringCompareOpTemplate.c.sed		\
+TypestringSelectOpTemplate.c.sed TypeSupport.c.sed TypeSupport.h.sed	\
+TypeSupportMatTemplate.c.sed TypeSupportMatTemplate.h.sed		\
+TypeSupportMonoOpTemplate.c.sed TypeSupportMonoOpTemplate.h.sed		\
+TypeSupportOpTemplate.c.sed TypeSupportOpTemplate.h.sed			\
+TypeXorOpTemplate.c.sed byte_data_c.sh char_data_c.sh data_h.sh		\
+double_data_c.sh float_data_c.sh int64_data_c.sh int_data_c.sh		\
+logical_data_c.sh long_data_c.sh math_funcs.sh multid_data_c.sh		\
+nclfile_data_c.sh obj_data_c.sh op_funcs.sh short_data_c.sh		\
+string_data_c.sh syms_lex.sh syms_tab_c.sh syms_tab_h.sh		\
+type_support_c.sh type_support_h.sh ubyte_data_c.sh uint64_data_c.sh	\
+uint_data_c.sh ulong_data_c.sh ushort_data_c.sh				\
+NclTypebyte.c.specific NclTypechar.c.specific				\
+NclTypedouble.c.specific NclTypefloat.c.specific			\
+NclTypeint64.c.specific NclTypeint.c.specific				\
+NclTypelogical.c.specific NclTypelong.c.specific			\
+NclTypeobj.c.specific NclTypeshort.c.specific				\
+NclTypestring.c.specific NclTypeubyte.c.specific			\
+NclTypeuint64.c.specific NclTypeuint.c.specific				\
+NclTypeulong.c.specific NclTypeushort.c.specific