fixed some warnings for errtbl.c on Cygwin systems

The funclist.sed sed script, when transforming func.c
into help/funclist.c, was creating nested comments.
While those were hardless, a single change to func.c
avoids the naive funclist.sed processing and avoids
(harmless) warnings when compiling help/funclist.c
in the course of building the function list.

CHANGES

@@ -1,4 +1,7 @@
-The following are the changes from calc version 2.14.3.5 to 2.15.0.0:
+The following are the changes from calc version 2.14.3.5 to 2.15.0.1:
+
+    The tarball for calc version 2.15.0.0 was missing version.h.
+    The version.h is now listed as part of the calc distribution.
 
     Added the following new trigonometric functions:
 
@@ -434,6 +437,31 @@ The following are the changes from calc version 2.14.3.4 to 2.14.3.5:
     Added errsym E_LOG2_4 for log2(0).
     Added errsym E_LOGN_6 for logn(0,base).
 
+    Added a chk_tree tool to help look for problems such as files that are
+    result of building calc that are also part of the calc distribution,
+    and files that are part of the calc source that are missing from the
+    calc distribution, and files that are of unknown status that are either
+    result of building calc nor missing from the calc distribution.
+
+    Updated file lists in Makefile, sorting as needed.
+
+    Updated Makefile PHONY rule to include Makefile rules that are NOT files.
+
+    Reduced make chatter for rules that build lists.
+
+    Added make verifydist to verify the existence of files that are part of
+    the calc distribution.
+
+    Added make verifydist to make prep.
+
+    Added a chk_tree double check, one after make clobber, one before
+    the final make chk, to make prep.  Added double pass of chk_tree to
+    make full_debug (and thus to the make debug output).
+
+    Improved notes for install locations in Makefile.config.
+
+    Added printing of ${BUILD_ALL} to make env output.
+
 
 The following are the changes from calc version 2.14.3.0 to 2.14.3.4:
 

Makefile

@@ -162,25 +162,23 @@ CALCOBJS= calc.o
 
 # these .h files are needed to build the math link library
 #
-LIB_H_SRC= alloc.h banned.h blkcpy.h block.h bool.h byteswap.h calc.h \
+LIB_H_SRC= alloc.h attribute.h banned.h blkcpy.h block.h bool.h byteswap.h \
-	cmath.h config.h custom.h decl.h errtbl.h file.h func.h hash.h \
+	calc.h cmath.h config.h custom.h decl.h errtbl.h file.h func.h \
-	hist.h int.h jump.h label.h lib_util.h lib_calc.h nametype.h \
+	hash.h hist.h int.h jump.h label.h lib_calc.h lib_util.h nametype.h \
-	opcodes.h prime.h qmath.h sha1.h str.h strl.h \
+	opcodes.h prime.h qmath.h sha1.h str.h strl.h symbol.h token.h \
-	symbol.h token.h value.h zmath.h zrand.h zrandom.h attribute.h
+	value.h version.h zmath.h zrand.h zrandom.h
 
 # we build these .h files during the make
 #
-BUILD_H_SRC= align32.h args.h conf.h endian_calc.h errsym.h \
+BUILD_H_SRC= align32.h args.h charbit.h conf.h endian_calc.h errsym.h fposval.h \
-	fposval.h have_ban_pragma.h have_const.h have_fgetsetpos.h \
+	have_arc4random.h have_ban_pragma.h have_const.h have_environ.h \
-	have_fpos_pos.h have_getpgid.h have_getprid.h have_getsid.h \
+	have_fgetsetpos.h have_fpos_pos.h have_getpgid.h have_getprid.h \
-	have_gettime.h have_memmv.h have_newstr.h have_offscl.h \
+	have_getsid.h have_gettime.h have_inttypes.h have_limits.h have_memmv.h \
-	have_posscl.h have_rusage.h have_stdlib.h have_strdup.h \
+	have_newstr.h have_offscl.h have_posscl.h have_rusage.h have_statfs.h \
-	have_string.h have_strlcat.h have_strlcpy.h have_times.h \
+	have_stdbool.h have_stdint.h have_stdlib.h have_strdup.h have_string.h \
-	have_uid_t.h have_unistd.h have_unused.h have_urandom.h \
+	have_strlcat.h have_strlcpy.h have_sys_mount.h have_sys_param.h \
-	have_ustat.h longbits.h terminal.h have_environ.h \
+	have_sys_vfs.h have_times.h have_uid_t.h have_unistd.h have_unused.h \
-	have_arc4random.h have_limits.h charbit.h have_sys_vfs.h \
+	have_urandom.h have_ustat.h longbits.h status.chk_c.h terminal.h
-	have_sys_param.h have_sys_mount.h have_statfs.h have_stdbool.h \
-	have_stdint.h status.chk_c.h
 
 # we build these .c files during the make
 #
@@ -190,13 +188,13 @@ BUILD_C_SRC=
 #
 # There MUST be a .c for every .o in UTIL_OBJS.
 #
-UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
+UTIL_C_SRC= align32.c charbit.c chk_c.c endian.c fposval.c have_arc4random.c \
-	have_const.c have_stdvs.c have_varvs.c fposval.c have_fgetsetpos.c \
+	have_ban_pragma.c have_const.c have_environ.c have_fgetsetpos.c \
-	have_fpos_pos.c have_offscl.c have_posscl.c have_memmv.c \
+	have_fpos_pos.c have_getpgid.c have_getprid.c have_getsid.c \
-	have_ustat.c have_getsid.c have_getpgid.c have_environ.c \
+	have_gettime.c have_memmv.c have_newstr.c have_offscl.c have_posscl.c \
-	have_gettime.c have_getprid.c have_rusage.c have_strdup.c \
+	have_rusage.c have_statfs.c have_stdvs.c have_strdup.c have_strlcat.c \
-	have_unused.c have_ban_pragma.c have_strlcpy.c have_strlcat.c \
+	have_strlcpy.c have_uid_t.c have_unused.c have_ustat.c have_varvs.c \
-	have_arc4random.c charbit.c have_statfs.c chk_c.c
+	longbits.c
 
 # these awk and sed tools are used in the process of building BUILD_H_SRC
 # and BUILD_C_SRC
@@ -269,10 +267,10 @@ LICENSE= COPYING COPYING-LGPL
 
 # These files are found (but not built) in the distribution
 #
-DISTLIST= ${C_SRC} ${H_SRC} ${MK_SET} BUGS CHANGES LIBRARY README.FIRST \
+DISTLIST= ${C_SRC} ${H_SRC} ${MK_SET} ${UTIL_MISC_SRC} ${LICENSE} \
-	  README.WINDOWS calc.man HOWTO.INSTALL ${UTIL_MISC_SRC} ${LICENSE} \
+	BUGS calc.man calc.spec.in CHANGES check.awk chk_tree CONTRIB-CODE \
-	  sample.README calc.spec.in rpm.mk README.md QUESTIONS CONTRIB-CODE \
+	HOWTO.INSTALL LIBRARY .lldbinit QUESTIONS README.FIRST README.md \
-	  README.RELEASE
+	README.RELEASE README.WINDOWS rpm.mk sample.README trailblank update_ver
 
 # These files are used to make (but not build) a calc .a link library
 #
@@ -336,15 +334,27 @@ TRAILBLANK= trailblank
 UPDATE_VER= update_ver
 CALC_TOOLS= ${TRAILBLANK} ${UPDATE_VER}
 
+# complete list of files that may be created as part of the build process
+#
+# Used by chk_tree via make prep
+#
+BUILD_ALL= ${LIBOBJS} ${CALCOBJS} ${BUILD_H_SRC} ${BUILD_C_SRC} \
+	   ${UTIL_OBJS} ${UTIL_TMP} ${UTIL_PROGS} ${SAMPLE_OBJ} \
+	   ${CALC_STATIC_LIBS} ${CALC_DYNAMIC_LIBS} ${SYM_DYNAMIC_LIBS} \
+	   ${SAMPLE_TARGETS} ${SAMPLE_STATIC_TARGETS} ${CSCRIPT_TARGETS} \
+	   .dynamic .static ${LATE_TARGETS} calc${EXT} errcode${EXT} \
+	   tags .hsrc outfile
+
 # complete list of targets
 #
 TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS} ${CALC_TOOLS}
 
 # rules that are not also names of files
 #
-PHONY= all calcliblist calc_version check chk clobber debug depend distdir \
+PHONY= all check_include sample hsrc depend h_list calc_version version distlist \
-	distlist hsrc install inst_files mkdebug rpm sample splint tags \
+	buildlist distdir calcliblist calcliblistfmt verifydist check chk calcinfo \
-	uninstall
+	env mkdebug full_debug debug testfuncsort prep run rpm inst_files \
+	olduninstall clean clobber install uninstall unbak splint strip
 
 ############################################################
 # Allow Makefile.local to change any of the above settings #
@@ -2389,7 +2399,7 @@ chk_c${EXT}: chk_c.c have_stdint.h have_inttypes.h have_stdlib.h bool.h have_ban
 		echo "#undef CHK_C /* chk_c failed to validate C compiler and/or include files */" >> status.chk_c.h; \
 	    else \
 		echo "Good news everyone! :-)" \
-		     "The C compiler and select include files appear to meet calc requirements." 1>&2; \
+		     "The C compiler and select include files appear to meet calc requirements."; \
 		echo "#define CHK_C" \
 		     "/* C compiler and select include files appear to meet calc requirements */" >> status.chk_c.h; \
 	    fi; \
@@ -2650,19 +2660,31 @@ distlist: ${DISTLIST} custom/Makefile
 		echo $$i; \
 	    fi; \
 	done; \
-	(cd help; ${MAKE} -f Makefile $@); \
+	(cd help; ${MAKE} -f Makefile -s $@); \
-	(cd cal; ${MAKE} -f Makefile $@); \
+	(cd cal; ${MAKE} -f Makefile -s $@); \
-	(cd custom; ${MAKE} -f Makefile $@); \
+	(cd custom; ${MAKE} -f Makefile -s $@); \
-	(cd cscript; ${MAKE} -f Makefile $@) \
+	(cd cscript; ${MAKE} -f Makefile -s $@) \
-	) | LANG=C ${SORT}
+	) | LANG=C ${SORT} -u
+
+buildlist:
+	${Q} (for i in ${BUILD_ALL} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo $$i; \
+	    fi; \
+	done; \
+	(cd help; ${MAKE} -f Makefile -s $@); \
+	(cd cal; ${MAKE} -f Makefile -s $@); \
+	(cd custom; ${MAKE} -f Makefile -s $@); \
+	(cd cscript; ${MAKE} -f Makefile -s $@) \
+	) | LANG=C ${SORT} -u
 
 distdir: custom/Makefile
 	${Q} (echo .; \
-	(cd help; ${MAKE} -f Makefile $@); \
+	(cd help; ${MAKE} -f Makefile -s $@); \
-	(cd cal; ${MAKE} -f Makefile $@); \
+	(cd cal; ${MAKE} -f Makefile -s $@); \
-	(cd custom; ${MAKE} -f Makefile $@); \
+	(cd custom; ${MAKE} -f Makefile -s $@); \
-	(cd cscript; ${MAKE} -f Makefile $@) \
+	(cd cscript; ${MAKE} -f Makefile -s $@) \
-	) | LANG=C ${SORT}
+	) | LANG=C ${SORT} -u
 
 calcliblist: custom/Makefile
 	${Q} (for i in ${CALCLIBLIST} /dev/null; do \
@@ -2670,11 +2692,11 @@ calcliblist: custom/Makefile
 		echo $$i; \
 	    fi; \
 	done; \
-	(cd help; ${MAKE} -f Makefile $@); \
+	(cd help; ${MAKE} -f Makefile -s $@); \
-	(cd cal; ${MAKE} -f Makefile $@); \
+	(cd cal; ${MAKE} -f Makefile -s $@); \
-	(cd custom; ${MAKE} -f Makefile $@); \
+	(cd custom; ${MAKE} -f Makefile -s $@); \
-	(cd cscript; ${MAKE} -f Makefile $@) \
+	(cd cscript; ${MAKE} -f Makefile -s $@) \
-	) | LANG=C ${SORT}
+	) | LANG=C ${SORT} -u
 
 calcliblistfmt:
 	${Q} ${MAKE} -f Makefile calcliblist | \
@@ -2686,6 +2708,10 @@ Makefile.simple:
 custom/Makefile.simple:
 	${Q} echo Support for $@ was dropped after the the release of calc v2.14.3.0.
 
+verifydist:
+	@${MAKE} -f Makefile Q= V=@ distdir >/dev/null 2>&1
+	@${MAKE} -f Makefile Q= V=@ distlist >/dev/null 2>&1
+
 ###
 #
 # Doing a 'make check' will cause the regression test suite to be executed.
@@ -2704,10 +2730,7 @@ check: all ./cal/regress.cal
 
 chk: ./cal/regress.cal
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${Q} echo
 	${CALC_ENV} ./calc${EXT} -d -q read regress 2>&1 | ${AWK} -f check.awk
-	@${MAKE} -f Makefile Q= V=@ distdir >/dev/null 2>&1
-	@${MAKE} -f Makefile Q= V=@ distlist >/dev/null 2>&1
 	${Q} echo
 	${Q} echo 'chk OK'
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -2816,6 +2839,7 @@ env:
 	@echo 'AWK=${AWK}'; echo ''
 	@echo 'BINDIR=${BINDIR}'; echo ''
 	@echo 'BLD_TYPE=${BLD_TYPE}'; echo ''
+	@echo 'BUILD_ALL=${BUILD_ALL}'; echo ''
 	@echo 'BUILD_C_SRC=${BUILD_C_SRC}'; echo ''
 	@echo 'BUILD_H_SRC=${BUILD_H_SRC}'; echo ''
 	@echo 'BYTE_ORDER=${BYTE_ORDER}'; echo ''
@@ -3022,6 +3046,15 @@ mkdebug: env version.c
 
 full_debug: calcinfo env
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	@echo '=-=-=-= Output of ${MAKE} -s distdir follows =-=-=-='
+	-@${MAKE} -f Makefile -s distdir
+	@echo '=-=-=-= End of output of {MAKE} -s distdir =-=-=-='
+	@echo '=-=-=-= Output of ${MAKE} -s distlist follows =-=-=-='
+	-@${MAKE} -f Makefile -s distlist
+	@echo '=-=-=-= End of output of {MAKE} -s distlist =-=-=-='
+	@echo '=-=-=-= Output of ${MAKE} -s buildlist follows =-=-=-='
+	-@${MAKE} -f Makefile -s buildlist
+	@echo '=-=-=-= End of output of {MAKE} -s buildlist =-=-=-='
 	@echo '=-=-=-= Contents of ${LOCAL_MKF} follows =-=-=-='
 	-@${CAT} ${LOCAL_MKF}
 	@echo '=-=-=-= End of contents of ${LOCAL_MKF} =-=-=-='
@@ -3034,6 +3067,9 @@ full_debug: calcinfo env
 	@echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-='
 	-@${MAKE} -f Makefile Q= H=@ S= E= V=@ clobber
 	@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
+	@echo '=-=-=-= start of chk_tree pass #0 =-=-=-=-=-='
+	-@./chk_tree
+	@echo '=-=-=-=-=-= end of chk_tree pass #0 =-=-=-=-=-='
 	@echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-='
 	@echo '=-=-= this may take a bit of time =-=-='
 	-@${MAKE} -f Makefile Q= H=@ S= E= V=@ all
@@ -3053,6 +3089,9 @@ full_debug: calcinfo env
 	@echo 'are allowed =-=-=-='
 	-@${CALC_ENV} ./calc${EXT} -e -q -C 'print custom("sysinfo", 2);'
 	@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
+	@echo '=-=-=-= start of chk_tree pass #1 =-=-=-=-=-='
+	-@./chk_tree
+	@echo '=-=-=-=-=-= end of chk_tree pass #1 =-=-=-=-=-='
 	@echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ check =-=-=-='
 	@echo '=-=-= this may take a while =-=-='
 	-@${MAKE} -f Makefile Q= V=@ check
@@ -3125,6 +3164,18 @@ prep:
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= end of ${MAKE} clobber =-=-=-=-=-='
 	${Q}echo
+	${Q}echo '=-=-=-=-=-= start of ${MAKE} verifydist =-=-=-=-=-='
+	${Q}echo
+	${MAKE} -s verifydist
+	${Q}echo
+	${Q}echo '=-=-=-=-=-= end of ${MAKE} verifydist =-=-=-=-=-='
+	${Q}echo
+	${Q}echo '=-=-=-=-=-= start of chk_tree pass #0 =-=-=-=-=-='
+	${Q}echo
+	-./chk_tree
+	${Q}echo
+	${Q}echo '=-=-=-=-=-= end of chk_tree pass #0 =-=-=-=-=-='
+	${Q}echo
 	${Q}echo '=-=-=-=-=-= start of ${TRAILBLANK} =-=-=-=-=-='
 	${Q}echo
 	./${TRAILBLANK}
@@ -3139,19 +3190,22 @@ prep:
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= start of ${MAKE} tags =-=-=-=-=-='
 	${Q}echo
-	${MAKE} tags
+	${MAKE} -s tags
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= end of ${MAKE} tags =-=-=-=-=-='
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= start of ${MAKE} depend =-=-=-=-=-='
 	${Q}echo
-	${MAKE} depend
+	${MAKE} -s depend
 	${Q}echo
+	@if [[ -f ${MAKE_FILE}.bak ]]; then echo ${MAKE_FILE}.bak exists 1>&2; exit 1; fi
+	@if [[ -f cscript/${MAKE_FILE}.bak ]]; then echo cscript/${MAKE_FILE}.bak exists 1>&2; exit 2; fi
+	@if [[ -f custom/${MAKE_FILE}.bak ]]; then echo custom/${MAKE_FILE}.bak exists 1>&2; exit 3; fi
 	${Q}echo '=-=-=-=-=-= end of ${MAKE} depend =-=-=-=-=-='
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= start of ${MAKE} testfuncsort =-=-=-=-=-='
 	${Q}echo
-	${MAKE} testfuncsort
+	${MAKE} -s testfuncsort
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= end of ${MAKE} testfuncsort =-=-=-=-=-='
 	${Q}echo
@@ -3161,9 +3215,15 @@ prep:
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= end of ${UPDATE_VER} =-=-=-=-=-='
 	${Q}echo
+	${Q}echo '=-=-=-=-=-= start of chk_tree pass #1 =-=-=-=-=-='
+	${Q}echo
+	-./chk_tree
+	${Q}echo
+	${Q}echo '=-=-=-=-=-= end of chk_tree pass #1 =-=-=-=-=-='
+	${Q}echo
 	${Q}echo '=-=-=-=-=-= start of ${MAKE} chk =-=-=-=-=-='
 	${Q}echo
-	${MAKE} chk
+	${MAKE} -s chk
 	${Q}echo
 	${Q}echo '=-=-=-=-=-= end of ${MAKE} chk =-=-=-=-=-='
 	${Q}echo
@@ -3306,8 +3366,7 @@ olduninstall:
 	${RM} -f -v custom/Makefile.simple custom/Makefile.simple.bak
 
 tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
-	-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
+	${CTAGS} -w ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC}
-	    ${GREP} -E -v 'Duplicate entry|Second entry ignored'
 
 clean:
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
@@ -3395,6 +3454,7 @@ clobber: clean
 	    ${RM} -rf .DS_Store; \
 	fi
 	${RM} -f func.show func.sort
+	${RM} -f outfile
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
 # install everything
@@ -4020,6 +4080,7 @@ addop.o: str.h
 addop.o: symbol.h
 addop.o: token.h
 addop.o: value.h
+addop.o: version.h
 addop.o: zmath.h
 align32.o: align32.c
 align32.o: banned.h
@@ -4057,6 +4118,7 @@ assocfunc.o: qmath.h
 assocfunc.o: sha1.h
 assocfunc.o: str.h
 assocfunc.o: value.h
+assocfunc.o: version.h
 assocfunc.o: zmath.h
 blkcpy.o: alloc.h
 blkcpy.o: attribute.h
@@ -4091,6 +4153,7 @@ blkcpy.o: qmath.h
 blkcpy.o: sha1.h
 blkcpy.o: str.h
 blkcpy.o: value.h
+blkcpy.o: version.h
 blkcpy.o: zmath.h
 block.o: alloc.h
 block.o: attribute.h
@@ -4121,6 +4184,7 @@ block.o: qmath.h
 block.o: sha1.h
 block.o: str.h
 block.o: value.h
+block.o: version.h
 block.o: zmath.h
 byteswap.o: alloc.h
 byteswap.o: attribute.h
@@ -4144,6 +4208,7 @@ byteswap.o: have_stdlib.h
 byteswap.o: have_string.h
 byteswap.o: longbits.h
 byteswap.o: qmath.h
+byteswap.o: version.h
 byteswap.o: zmath.h
 calc.o: alloc.h
 calc.o: args.h
@@ -4192,6 +4257,7 @@ calc.o: strl.h
 calc.o: symbol.h
 calc.o: token.h
 calc.o: value.h
+calc.o: version.h
 calc.o: zmath.h
 charbit.o: banned.h
 charbit.o: charbit.c
@@ -4201,6 +4267,7 @@ chk_c.o: banned.h
 chk_c.o: bool.h
 chk_c.o: chk_c.c
 chk_c.o: have_ban_pragma.h
+chk_c.o: have_inttypes.h
 chk_c.o: have_stdbool.h
 chk_c.o: have_stdint.h
 chk_c.o: have_stdlib.h
@@ -4245,6 +4312,7 @@ codegen.o: strl.h
 codegen.o: symbol.h
 codegen.o: token.h
 codegen.o: value.h
+codegen.o: version.h
 codegen.o: zmath.h
 comfunc.o: alloc.h
 comfunc.o: attribute.h
@@ -4270,6 +4338,7 @@ comfunc.o: have_string.h
 comfunc.o: longbits.h
 comfunc.o: nametype.h
 comfunc.o: qmath.h
+comfunc.o: version.h
 comfunc.o: zmath.h
 commath.o: alloc.h
 commath.o: attribute.h
@@ -4293,6 +4362,7 @@ commath.o: have_stdlib.h
 commath.o: have_string.h
 commath.o: longbits.h
 commath.o: qmath.h
+commath.o: version.h
 commath.o: zmath.h
 config.o: alloc.h
 config.o: attribute.h
@@ -4331,6 +4401,7 @@ config.o: str.h
 config.o: strl.h
 config.o: token.h
 config.o: value.h
+config.o: version.h
 config.o: zmath.h
 config.o: zrand.h
 const.o: alloc.h
@@ -4363,6 +4434,7 @@ const.o: qmath.h
 const.o: sha1.h
 const.o: str.h
 const.o: value.h
+const.o: version.h
 const.o: zmath.h
 custom.o: alloc.h
 custom.o: attribute.h
@@ -4395,6 +4467,7 @@ custom.o: qmath.h
 custom.o: sha1.h
 custom.o: str.h
 custom.o: value.h
+custom.o: version.h
 custom.o: zmath.h
 endian.o: banned.h
 endian.o: endian.c
@@ -4431,6 +4504,7 @@ errtbl.o: qmath.h
 errtbl.o: sha1.h
 errtbl.o: str.h
 errtbl.o: value.h
+errtbl.o: version.h
 errtbl.o: zmath.h
 file.o: alloc.h
 file.o: attribute.h
@@ -4470,6 +4544,7 @@ file.o: sha1.h
 file.o: str.h
 file.o: strl.h
 file.o: value.h
+file.o: version.h
 file.o: zmath.h
 fposval.o: alloc.h
 fposval.o: banned.h
@@ -4493,6 +4568,7 @@ fposval.o: have_stdlib.h
 fposval.o: have_string.h
 fposval.o: have_unused.h
 fposval.o: longbits.h
+fposval.o: version.h
 fposval.o: zmath.h
 func.o: alloc.h
 func.o: attribute.h
@@ -4541,6 +4617,7 @@ func.o: strl.h
 func.o: symbol.h
 func.o: token.h
 func.o: value.h
+func.o: version.h
 func.o: zmath.h
 func.o: zrand.h
 func.o: zrandom.h
@@ -4574,6 +4651,7 @@ hash.o: qmath.h
 hash.o: sha1.h
 hash.o: str.h
 hash.o: value.h
+hash.o: version.h
 hash.o: zmath.h
 hash.o: zrand.h
 hash.o: zrandom.h
@@ -4706,6 +4784,7 @@ help.o: qmath.h
 help.o: sha1.h
 help.o: str.h
 help.o: value.h
+help.o: version.h
 help.o: zmath.h
 hist.o: alloc.h
 hist.o: attribute.h
@@ -4745,6 +4824,7 @@ hist.o: sha1.h
 hist.o: str.h
 hist.o: strl.h
 hist.o: value.h
+hist.o: version.h
 hist.o: zmath.h
 input.o: alloc.h
 input.o: attribute.h
@@ -4782,6 +4862,7 @@ input.o: sha1.h
 input.o: str.h
 input.o: strl.h
 input.o: value.h
+input.o: version.h
 input.o: zmath.h
 jump.o: banned.h
 jump.o: decl.h
@@ -4823,6 +4904,7 @@ label.o: sha1.h
 label.o: str.h
 label.o: token.h
 label.o: value.h
+label.o: version.h
 label.o: zmath.h
 lib_calc.o: alloc.h
 lib_calc.o: attribute.h
@@ -4867,6 +4949,7 @@ lib_calc.o: symbol.h
 lib_calc.o: terminal.h
 lib_calc.o: token.h
 lib_calc.o: value.h
+lib_calc.o: version.h
 lib_calc.o: zmath.h
 lib_calc.o: zrandom.h
 lib_util.o: alloc.h
@@ -4890,6 +4973,7 @@ lib_util.o: have_string.h
 lib_util.o: lib_util.c
 lib_util.o: lib_util.h
 lib_util.o: longbits.h
+lib_util.o: version.h
 lib_util.o: zmath.h
 listfunc.o: alloc.h
 listfunc.o: attribute.h
@@ -4920,6 +5004,7 @@ listfunc.o: qmath.h
 listfunc.o: sha1.h
 listfunc.o: str.h
 listfunc.o: value.h
+listfunc.o: version.h
 listfunc.o: zmath.h
 listfunc.o: zrand.h
 longbits.o: banned.h
@@ -4959,6 +5044,7 @@ matfunc.o: qmath.h
 matfunc.o: sha1.h
 matfunc.o: str.h
 matfunc.o: value.h
+matfunc.o: version.h
 matfunc.o: zmath.h
 matfunc.o: zrand.h
 math_error.o: alloc.h
@@ -4993,6 +5079,7 @@ math_error.o: qmath.h
 math_error.o: sha1.h
 math_error.o: str.h
 math_error.o: value.h
+math_error.o: version.h
 math_error.o: zmath.h
 obj.o: alloc.h
 obj.o: attribute.h
@@ -5031,6 +5118,7 @@ obj.o: str.h
 obj.o: strl.h
 obj.o: symbol.h
 obj.o: value.h
+obj.o: version.h
 obj.o: zmath.h
 opcodes.o: alloc.h
 opcodes.o: attribute.h
@@ -5072,6 +5160,7 @@ opcodes.o: sha1.h
 opcodes.o: str.h
 opcodes.o: symbol.h
 opcodes.o: value.h
+opcodes.o: version.h
 opcodes.o: zmath.h
 opcodes.o: zrand.h
 opcodes.o: zrandom.h
@@ -5094,6 +5183,7 @@ pix.o: longbits.h
 pix.o: pix.c
 pix.o: prime.h
 pix.o: qmath.h
+pix.o: version.h
 pix.o: zmath.h
 poly.o: alloc.h
 poly.o: attribute.h
@@ -5124,6 +5214,7 @@ poly.o: qmath.h
 poly.o: sha1.h
 poly.o: str.h
 poly.o: value.h
+poly.o: version.h
 poly.o: zmath.h
 prime.o: alloc.h
 prime.o: banned.h
@@ -5145,6 +5236,7 @@ prime.o: longbits.h
 prime.o: prime.c
 prime.o: prime.h
 prime.o: qmath.h
+prime.o: version.h
 prime.o: zmath.h
 qfunc.o: alloc.h
 qfunc.o: attribute.h
@@ -5170,6 +5262,7 @@ qfunc.o: nametype.h
 qfunc.o: prime.h
 qfunc.o: qfunc.c
 qfunc.o: qmath.h
+qfunc.o: version.h
 qfunc.o: zmath.h
 qio.o: alloc.h
 qio.o: args.h
@@ -5196,6 +5289,7 @@ qio.o: longbits.h
 qio.o: nametype.h
 qio.o: qio.c
 qio.o: qmath.h
+qio.o: version.h
 qio.o: zmath.h
 qmath.o: alloc.h
 qmath.o: attribute.h
@@ -5220,6 +5314,7 @@ qmath.o: longbits.h
 qmath.o: nametype.h
 qmath.o: qmath.c
 qmath.o: qmath.h
+qmath.o: version.h
 qmath.o: zmath.h
 qmod.o: alloc.h
 qmod.o: attribute.h
@@ -5244,6 +5339,7 @@ qmod.o: longbits.h
 qmod.o: nametype.h
 qmod.o: qmath.h
 qmod.o: qmod.c
+qmod.o: version.h
 qmod.o: zmath.h
 qtrans.o: alloc.h
 qtrans.o: attribute.h
@@ -5268,6 +5364,7 @@ qtrans.o: longbits.h
 qtrans.o: nametype.h
 qtrans.o: qmath.h
 qtrans.o: qtrans.c
+qtrans.o: version.h
 qtrans.o: zmath.h
 quickhash.o: alloc.h
 quickhash.o: attribute.h
@@ -5298,6 +5395,7 @@ quickhash.o: quickhash.c
 quickhash.o: sha1.h
 quickhash.o: str.h
 quickhash.o: value.h
+quickhash.o: version.h
 quickhash.o: zmath.h
 quickhash.o: zrand.h
 quickhash.o: zrandom.h
@@ -5332,6 +5430,7 @@ sample_many.o: sample_many.c
 sample_many.o: sha1.h
 sample_many.o: str.h
 sample_many.o: value.h
+sample_many.o: version.h
 sample_many.o: zmath.h
 sample_many.o: zrandom.h
 sample_rand.o: alloc.h
@@ -5365,6 +5464,7 @@ sample_rand.o: sample_rand.c
 sample_rand.o: sha1.h
 sample_rand.o: str.h
 sample_rand.o: value.h
+sample_rand.o: version.h
 sample_rand.o: zmath.h
 sample_rand.o: zrandom.h
 seed.o: alloc.h
@@ -5401,6 +5501,7 @@ seed.o: have_ustat.h
 seed.o: longbits.h
 seed.o: qmath.h
 seed.o: seed.c
+seed.o: version.h
 seed.o: zmath.h
 sha1.o: align32.h
 sha1.o: alloc.h
@@ -5432,6 +5533,7 @@ sha1.o: sha1.c
 sha1.o: sha1.h
 sha1.o: str.h
 sha1.o: value.h
+sha1.o: version.h
 sha1.o: zmath.h
 size.o: alloc.h
 size.o: attribute.h
@@ -5462,6 +5564,7 @@ size.o: sha1.h
 size.o: size.c
 size.o: str.h
 size.o: value.h
+size.o: version.h
 size.o: zmath.h
 size.o: zrand.h
 size.o: zrandom.h
@@ -5498,6 +5601,7 @@ str.o: str.c
 str.o: str.h
 str.o: strl.h
 str.o: value.h
+str.o: version.h
 str.o: zmath.h
 strl.o: alloc.h
 strl.o: banned.h
@@ -5546,6 +5650,7 @@ symbol.o: symbol.c
 symbol.o: symbol.h
 symbol.o: token.h
 symbol.o: value.h
+symbol.o: version.h
 symbol.o: zmath.h
 token.o: alloc.h
 token.o: args.h
@@ -5580,6 +5685,7 @@ token.o: str.h
 token.o: token.c
 token.o: token.h
 token.o: value.h
+token.o: version.h
 token.o: zmath.h
 value.o: alloc.h
 value.o: attribute.h
@@ -5617,6 +5723,7 @@ value.o: str.h
 value.o: symbol.h
 value.o: value.c
 value.o: value.h
+value.o: version.h
 value.o: zmath.h
 value.o: zrand.h
 value.o: zrandom.h
@@ -5654,6 +5761,7 @@ version.o: str.h
 version.o: strl.h
 version.o: value.h
 version.o: version.c
+version.o: version.h
 version.o: zmath.h
 zfunc.o: alloc.h
 zfunc.o: attribute.h
@@ -5674,6 +5782,7 @@ zfunc.o: have_stdbool.h
 zfunc.o: have_stdlib.h
 zfunc.o: have_string.h
 zfunc.o: longbits.h
+zfunc.o: version.h
 zfunc.o: zfunc.c
 zfunc.o: zmath.h
 zio.o: alloc.h
@@ -5699,6 +5808,7 @@ zio.o: have_string.h
 zio.o: longbits.h
 zio.o: nametype.h
 zio.o: qmath.h
+zio.o: version.h
 zio.o: zio.c
 zio.o: zmath.h
 zmath.o: alloc.h
@@ -5713,6 +5823,7 @@ zmath.o: errsym.h
 zmath.o: errtbl.h
 zmath.o: have_ban_pragma.h
 zmath.o: have_const.h
+zmath.o: have_inttypes.h
 zmath.o: have_limits.h
 zmath.o: have_memmv.h
 zmath.o: have_newstr.h
@@ -5723,6 +5834,7 @@ zmath.o: have_string.h
 zmath.o: int.h
 zmath.o: longbits.h
 zmath.o: status.chk_c.h
+zmath.o: version.h
 zmath.o: zmath.c
 zmath.o: zmath.h
 zmod.o: alloc.h
@@ -5747,6 +5859,7 @@ zmod.o: have_string.h
 zmod.o: longbits.h
 zmod.o: nametype.h
 zmod.o: qmath.h
+zmod.o: version.h
 zmod.o: zmath.h
 zmod.o: zmod.c
 zmul.o: alloc.h
@@ -5771,6 +5884,7 @@ zmul.o: have_string.h
 zmul.o: longbits.h
 zmul.o: nametype.h
 zmul.o: qmath.h
+zmul.o: version.h
 zmul.o: zmath.h
 zmul.o: zmul.c
 zprime.o: alloc.h
@@ -5803,6 +5917,7 @@ zprime.o: qmath.h
 zprime.o: sha1.h
 zprime.o: str.h
 zprime.o: value.h
+zprime.o: version.h
 zprime.o: zmath.h
 zprime.o: zprime.c
 zprime.o: zrand.h
@@ -5835,6 +5950,7 @@ zrand.o: qmath.h
 zrand.o: sha1.h
 zrand.o: str.h
 zrand.o: value.h
+zrand.o: version.h
 zrand.o: zmath.h
 zrand.o: zrand.c
 zrand.o: zrand.h
@@ -5867,6 +5983,7 @@ zrandom.o: qmath.h
 zrandom.o: sha1.h
 zrandom.o: str.h
 zrandom.o: value.h
+zrandom.o: version.h
 zrandom.o: zmath.h
 zrandom.o: zrandom.c
 zrandom.o: zrandom.h

Makefile.config

@@ -852,12 +852,21 @@ endif	# ($(target),Darwin)
 #	BINDIR= /usr/bin
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
+#	CALC_INCDIR= /usr/include/calc
+#
+# Or if you prefer everything under /usr/local:
+#
+#	BINDIR= /usr/local/bin
+#	LIBDIR= /usr/local/lib
+#	CALC_SHAREDIR= /usr/local/share/calc
+#	CALC_INCDIR= /usr/local/include/calc
 #
 # However, if you are on macOS then set:
 #
 #	BINDIR= ${PREFIX}/bin
 #	LIBDIR= ${PREFIX}/lib
 #	CALC_SHAREDIR= ${PREFIX}/share/calc
+#	CALC_INCDIR= ${PREFIX}/include/calc
 #
 #	NOTE: Starting with macOS El Capitan OS X 10.11, root by default
 #	      could not mkdir under system locations, so macOS must now
@@ -1267,7 +1276,7 @@ EXT=
 
 # The calc version in the form of x.y.z.w
 #
-VERSION= 2.15.0.0
+VERSION= 2.15.0.1
 
 # The calc major version in the form of x.y.z
 #

Makefile.local

@@ -49,6 +49,17 @@
 # Comments start with a #-character.				  #
 ###################################################################
 
+####
+#
+# Force calc to install under /usr/local
+#
+# BINDIR:= /usr/local/bin
+# LIBDIR:= /usr/local/lib
+# CALC_SHAREDIR:= /usr/local/share/calc
+# CALC_INCDIR:= /usr/local/include/calc
+#
+####
+
 ####
 # RHEL Diagnosing memory, thread, and crash issues:
 #

cal/Makefile

@@ -159,10 +159,11 @@ DISTLIST= ${CALC_FILES} ${MAKE_FILE}
 # These files are used to make (but not built) a calc .a link library
 #
 CALCLIBLIST=
-#
+
 # rules that are not also names of files
 #
-PHONY= all clobber distlist install
+PHONY= all distlist buildlist distdir calcliblist calc_files_list echo_inst_files \
+	clean clobber install uninstall
 
 
 ############################################################
@@ -182,14 +183,14 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 # additional Makefile targets #
 ###############################
 
+.PHONY: ${PHONY}
+
 # used by the upper level Makefile to determine of we have done all
 #
 .all:
 	${RM} -f .all
 	${TOUCH} .all
 
-.PHONY: ${PHONY}
-
 ##
 #
 # File list generation.	 You can ignore this section.
@@ -210,6 +211,13 @@ distlist: ${DISTLIST}
 	    fi; \
 	done
 
+buildlist:
+	${Q} for i in ${BUILD_ALL} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo cal/$$i; \
+	    fi; \
+	done | fgrep -v '.bak' | LANG=C ${SORT}
+
 distdir:
 	${Q} echo cal
 

chk_tree

@@ -0,0 +1,243 @@
+#!/usr/bin/env bash
+#
+# chk_tree - verify that the source tree and git and Makefiles are in sync
+#
+# This tools is used by "make prep".
+#
+# Copyright (C) 2023 Landon Curt Noll
+#
+# Calc is open software; you can redistribute it and/or modify it under
+# the terms of version 2.1 of the GNU Lesser General Public License
+# as published by the Free Software Foundation.
+#
+# Calc is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
+#
+# A copy of version 2.1 of the GNU Lesser General Public License is
+# distributed with calc under the filename COPYING-LGPL.  You should have
+# received a copy with calc; if not, write to Free Software Foundation, Inc.
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+#
+# Under source code control:	2023/10/04 21:04:44
+# File existed as early as:	2023
+#
+# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/
+
+# setup
+#
+EXIT_CODE=0
+
+# firewall - verify that the "make distdir" directories exist
+#
+make distdir >/dev/null 2>&1
+status="$?"
+if [[ $status -ne 0 ]]; then
+    echo "$0: ERROR: make distdir exit code: $status" 1>&2
+    EXIT_CODE=10
+    echo "$0: Warning: set EXIT_CODE: $EXIT_CODE" 1>&2
+fi
+
+# collect make distdir directory list
+#
+# We ignore make action lines.
+#
+declare -a DISTDIR
+mapfile -t DISTDIR < <(make -s distdir | grep -v '^make\[[0-9]*\]: ' | sort -u)
+
+# collect directories
+#
+# We ignore NOTES because it contains notes that are not part of calc source.
+# We ignore .git and GitHub because they are not part of the calc source tarball.
+#
+declare -a FINDDIR
+mapfile -t FINDDIR < <(find . -type d \
+	! -path './NOTES/*' ! -name NOTES \
+	! -path './.git/*' ! -name .git \
+	! -path './.github/*' ! -name .github | \
+	sed -e 's/^\.\///' | sort -u)
+
+# compare DISTDIR and FINDDIR
+#
+declare -a DIFF_DISTDIR_FINDDIR
+mapfile -t DIFF_DISTDIR_FINDDIR < <(printf '%s\n' "${DISTDIR[@]}" "${FINDDIR[@]}" |
+				    tr ' ' '\n' | sort | uniq -u)
+if [[ ${#DIFF_DISTDIR_FINDDIR[@]} -ne 0 ]]; then
+
+    # report that DISTDIR and FINDDIR differ
+    #
+    echo "$0: ERROR: distdir and find dir differ for critical directories" 1>&2
+    declare -a ONLY_FINDDIR
+    mapfile -t ONLY_FINDDIR < <(printf '%s\n' "${DISTDIR[@]}" "${DISTDIR[@]}" "${FINDDIR[@]}" |
+				tr ' ' '\n' | sort | uniq -u)
+    if [[ ${#ONLY_FINDDIR[@]} -ne 0 ]]; then
+	echo "$0: ERROR: found only in find dir: ${ONLY_FINDDIR[*]}" 1>&2
+    fi
+    declare -a ONLY_DISTDIR
+    mapfile -t ONLY_DISTDIR < <(printf '%s\n' "${FINDDIR[@]}" "${FINDDIR[@]}" "${DISTDIR[@]}" |
+				tr ' ' '\n' | sort | uniq -u)
+    if [[ ${#ONLY_DISTDIR[@]} -ne 0 ]]; then
+	echo "$0: ERROR: found only in distdir: ${ONLY_DISTDIR[*]}" 1>&2
+    fi
+    EXIT_CODE=11
+    echo "$0: Warning: set EXIT_CODE: $EXIT_CODE" 1>&2
+fi
+
+# firewall - verify that the "make distlist" files exist
+#
+make distlist >/dev/null 2>&1
+status="$?"
+if [[ $status -ne 0 ]]; then
+    echo "$0: ERROR: make distlist exit code: $status" 1>&2
+    EXIT_CODE=12
+    echo "$0: Warning: set EXIT_CODE: $EXIT_CODE" 1>&2
+fi
+
+# collect make distlist file list
+#
+declare -a DISTLIST
+mapfile -t DISTLIST < <(make -s distlist | grep -v '^make\[[0-9]*\]: ' | sort -u)
+declare -A DISTLIST_A
+for i in "${DISTLIST[@]}"; do
+    DISTLIST_A["$i"]="$i"
+done
+
+# case: under git control
+#
+if [[ -d .git ]]; then
+
+    # obtain the list of files under git
+    #
+    # We ignore .git and GitHub related files because they are not part of the calc source tarball.
+    #
+    declare -a GITLS
+    mapfile -t GITLS < <(git ls |
+	grep -v -E '^\.github/|^\.gitignore$|^CODE_OF_CONDUCT\.md$|^CONTRIBUTING\.md$|^SECURITY\.md$' |
+	sort -u)
+
+    # compare DISTLIST and GITLS
+    #
+    declare -a DIFF_DISTLIST_GITLS
+    mapfile -t DIFF_DISTLIST_GITLS < <(printf '%s\n' "${DISTLIST[@]}" "${GITLS[@]}" |
+				       tr ' ' '\n' | sort | uniq -u)
+    if [[ ${#DIFF_DISTLIST_GITLS[@]} -ne 0 ]]; then
+
+	# report that DISTLIST and GITLS differ
+	#
+	echo "$0: ERROR: distlist and git ls differ for critical files" 1>&2
+	declare -a ONLY_GITLS
+	mapfile -t ONLY_GITLS < <(printf '%s\n' "${DISTLIST[@]}" "${DISTLIST[@]}" "${GITLS[@]}" |
+				  tr ' ' '\n' | sort | uniq -u)
+	if [[ ${#ONLY_GITLS[@]} -ne 0 ]]; then
+	    echo "$0: ERROR: found only in git ls: ${ONLY_GITLS[*]}" 1>&2
+	fi
+	declare -a ONLY_DISTLIST
+	mapfile -t ONLY_DISTLIST < <(printf '%s\n' "${GITLS[@]}" "${GITLS[@]}" "${DISTLIST[@]}" |
+				     tr ' ' '\n' | sort | uniq -u)
+	if [[ ${#ONLY_DISTLIST[@]} -ne 0 ]]; then
+	    echo "$0: ERROR: found only in distlist: ${ONLY_DISTLIST[*]}" 1>&2
+	fi
+	EXIT_CODE=13
+	echo "$0: Warning: set EXIT_CODE: $EXIT_CODE" 1>&2
+    fi
+fi
+
+# collect make buildlist file list
+#
+declare -a BUILDLIST
+mapfile -t BUILDLIST < <(make -s buildlist | grep -v '^make\[[0-9]*\]: ' | sort -u)
+declare -A BUILDLIST_A
+for i in "${BUILDLIST[@]}"; do
+    BUILDLIST_A["$i"]="$i"
+done
+
+# look for something in DISTLIST that is also in BUILDLIST
+#
+# The BUILDLIST are a set of files that are result of building calc
+# and thus should NOT be part of the DISTLIST (list of files used
+# to form the calc source distribtion).
+#
+declare -a DISTLIST_ALSO_IN_BUILDLIST
+mapfile -t DISTLIST_ALSO_IN_BUILDLIST < <(
+    for i in "${DISTLIST_A[@]}"; do
+	if [[ -n "${BUILDLIST_A[$i]}" ]]; then
+	    echo "$i";
+	fi
+    done
+)
+if [[ ${#DISTLIST_ALSO_IN_BUILDLIST[@]} -ne 0 ]]; then
+
+    # report that something in DISTLIST was found in BUILDLIST
+    #
+    echo "$0: ERROR: distlist files found in buildlist" 1>&2
+    echo "$0: ERROR: distlist files found in buildlist: ${DISTLIST_ALSO_IN_BUILDLIST[*]}" 1>&2
+    EXIT_CODE=14
+    echo "$0: Warning: set EXIT_CODE: $EXIT_CODE" 1>&2
+fi
+
+# collect list of files
+#
+# We ignore NOTES because it contains notes that are not part of calc source.
+# We ignore .git and GitHub because they are not part of the calc source tarball.
+# We ignore .*.swp files as they are a result of vim sessions.
+# We ignore *.out files as they are used to collect information.
+# We ignore single letter files as they are used for temporary files.
+#
+declare -a FINDFILE
+mapfile -t FINDFILE < <(find . -type f \
+	! -path './NOTES/*' ! -name NOTES \
+	! -path './.git/*' ! -name .git \
+	! -path './.github/*' ! -name .github \
+	! -name 'CODE_OF_CONDUCT.md' ! -name 'CONTRIBUTING.md' ! -name '.gitignore' ! -name 'SECURITY.md'  \
+	! -name '*.swp' ! -name '*.out' ! -name '?' |
+	sed -e 's/^\.\///' | sort -u)
+
+# look for something in FINDFILE that in neither DISTLIST nor BUILDLIST
+#
+# We look for a file that is neither a file that neither a result of building calc,
+# nor part of the calc distribution list in a file list.
+#
+# NOTE that the file list has already excluded certain files (see previous section).
+#
+# We flag any file in the list that is neither a result of building calc,
+# nor part of the calc distribution list in a file list.
+#
+declare -a UNKNOWN_FILE
+mapfile -t UNKNOWN_FILE < <(
+    for i in "${FINDFILE[@]}"; do
+
+	# skip if this is a file that is result of building calc
+	#
+	if [[ -n ${BUILDLIST_A["$i"]} ]]; then
+	    continue
+	fi
+
+	# skip if this is a file that is calc distribution list
+	#
+	if [[ -n ${DISTLIST_A["$i"]} ]]; then
+	    continue
+	fi
+
+	# print the file of unknown status
+	#
+	echo "$i"
+    done
+)
+if [[ ${#UNKNOWN_FILE[@]} -ne 0 ]]; then
+
+    # report that something in DISTLIST was found in BUILDLIST
+    #
+    echo "$0: ERROR: files that are neither built nor distlist are found" 1>&2
+    echo "$0: ERROR: distlist files found in buildlist: ${UNKNOWN_FILE[*]}" 1>&2
+    EXIT_CODE=15
+    echo "$0: Warning: set EXIT_CODE: $EXIT_CODE" 1>&2
+fi
+
+# All Done!!! -- Jessica Noll, Age 2
+#
+if [[ $EXIT_CODE -ne 0 ]]; then
+    echo "$0: Warning: about to exit $EXIT_CODE" 1>&2
+fi
+exit "$EXIT_CODE"

cscript/Makefile

@@ -142,6 +142,12 @@ DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README.src
 #
 CALCLIBLIST=
 
+# complete list of files that may be created as part of the build process
+#
+# Used by chk_tree via make prep
+#
+BUILD_ALL= ${SCRIPT} README
+
 # complete list of targets
 #
 # NOTE: This list MUST be coordinated with the ${CSCRIPT_TARGETS} variable
@@ -149,10 +155,11 @@ CALCLIBLIST=
 #
 CSCRIPT_TARGETS= ${SCRIPT}
 TARGETS= ${CSCRIPT_TARGETS} README
-#
+
 # rules that are not also names of files
 #
-PHONY= all clobber distlist install
+PHONY= all distlist buildlist distdir calcliblist detaillist depend \
+	echo_inst_files clean clobber install uninstall
 
 
 ############################################################
@@ -206,6 +213,13 @@ distlist: ${DISTLIST}
 	    fi; \
 	done | LANG=C ${SORT}
 
+buildlist:
+	${Q} for i in ${BUILD_ALL} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo cscript/$$i; \
+	    fi; \
+	done | fgrep -v '.bak' | LANG=C ${SORT}
+
 distdir:
 	${Q} echo cscript
 

custom/Makefile

@@ -215,10 +215,23 @@ CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
 #
 CALC_STATIC_LIBCUSTCALC= libcustcalc.a
 
+# complete list of files that may be created as part of the build process
+#
+# Used by chk_tree via make prep
+#
+BUILD_ALL= ${REQUIRED_OBJ} ${CUSTOM_OBJ} \
+	${CALC_DYNAMIC_LIBCUSTCALC} ${CALC_STATIC_LIBCUSTCALC} \
+	.all
+
 # complete list of targets
 #
 TARGETS= ${BLD_TYPE}
 
+# rules that are not also names of files
+#
+PHONY= all distlist buildlist distdir calcliblist depend echo_inst_files clean \
+	clobber install uninstall
+
 
 ############################################################
 # Allow Makefile.local to change any of the above settings #
@@ -238,6 +251,8 @@ all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
 # additional Makefile targets #
 ###############################
 
+.PHONY: ${PHONY}
+
 calc-dynamic-only: ${CUSTCALC_OBJ} ${CALC_DYNAMIC_LIBCUSTCALC}
 
 calc-static-only: ${CUSTCALC_OBJ} ${CALC_STATIC_LIBCUSTCALC}
@@ -295,6 +310,13 @@ distlist: ${DISTLIST}
 	    fi; \
 	done
 
+buildlist:
+	${Q} for i in ${BUILD_ALL} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo custom/$$i; \
+	    fi; \
+	done | fgrep -v '.bak' | LANG=C ${SORT}
+
 distdir:
 	${Q} echo custom
 

errtbl.c

@@ -855,7 +855,7 @@ is_e_digits(CONST char *errsym)
 	 * check for only digits remaining
 	 */
 	for (p = errsym+2; *p != '\0'; ++p) {
-		if (!isascii(*p) || !isdigit(*p)) {
+		if (!isascii((int)*p) || !isdigit((int)*p)) {
 			return false;
 		}
 	}
@@ -1090,7 +1090,7 @@ is_e_1string(CONST char *errsym)
 	 * must match regular expression: ^E_[A-Z][A-Z0-9_]+$
 	 */
 	for (p = errsym+3; *p != '\0'; ++p) {
-		if (!isascii(*p) || !(isupper(*p) || isdigit(*p) || *p == '_')) {
+		if (!isascii((int)*p) || !(isupper((int)*p) || isdigit((int)*p) || *p == '_')) {
 			return false;
 		}
 	}
@@ -2183,8 +2183,8 @@ print_errsym(void)
 int
 main(int argc, char *argv[])
 {
-	extern char *optarg;		/* argv index of the next arg */
+	EXTERN char *optarg;		/* argv index of the next arg */
-	extern int optind;		/* argv index of the next arg */
+	EXTERN int optind;		/* argv index of the next arg */
 	int e_flag = 0;			/* 1 ==> -e flag was used */
 	int d_flag = 0;			/* 1 ==> -s flag was used */
 	int i;

func.c

@@ -2577,7 +2577,7 @@ f_logn(int count, VALUE **vals)
 			if (p_cval == NULL) {
 				return error_value(E_LOGN_3);
 			}
-			/* check if division is COMPLEX or NUMBER */
+			/* check for COMPLEX or NUMBER division */
 			if (cisreal(p_cval)) {
 				/* ln(x) / ln(n) was NUMBER, not COMPLEX */
 				result.v_num = c_to_q(p_cval, true);
@@ -2597,7 +2597,7 @@ f_logn(int count, VALUE **vals)
 			if (p_cval == NULL) {
 				return error_value(E_LOGN_3);
 			}
-			/* check if division is COMPLEX or NUMBER */
+			/* check for COMPLEX or NUMBER division */
 			if (cisreal(p_cval)) {
 				/* ln(x) / ln(n) was NUMBER, not COMPLEX */
 				result.v_num = c_to_q(p_cval, true);
@@ -2623,13 +2623,13 @@ f_logn(int count, VALUE **vals)
 			if (p_cval == NULL) {
 				return error_value(E_LOGN_3);
 			}
-			/* check if division is COMPLEX or NUMBER */
+			/* check for COMPLEX or NUMBER division */
 			if (cisreal(p_cval)) {
 				/* ln(x) / ln(n) was NUMBER, not COMPLEX */
 				result.v_num = c_to_q(p_cval, true);
 				result.v_type = V_NUM;
 			} else {
-				/* ln(x) / ln(n) is COMPLEX */
+				/* ln(x) / ln(n) is COMPLEX result */
 				result.v_type = V_COM;
 				result.v_com = p_cval;
 			}
@@ -2643,7 +2643,7 @@ f_logn(int count, VALUE **vals)
 			if (result.v_com == NULL) {
 				return error_value(E_LOGN_3);
 			}
-			/* ln(x) / ln(n) is NUMBER */
+			/* ln(x) / ln(n) is NUMBER result */
 			result.v_type = V_NUM;
 		}
 	}

help/Makefile

@@ -254,10 +254,18 @@ DISTLIST= ${STD_HELP_FILES} ${DETAIL_HELP} ${MAKE_FILE} \
 # These files are used to make (but not built) a calc .a link library
 #
 CALCLIBLIST=
+
+# complete list of files that may be created as part of the build process
 #
+# Used by chk_tree via make prep
+#
+BUILD_ALL= ${BLT_HELP_FILES} ${SINGULAR_FILES} ${DETAIL_CLONE} \
+	   full funclist${EXT} funclist.c funclist.o
+
 # rules that are not also names of files
 #
-PHONY= all clobber distlist install
+PHONY= all distlist buildlist distdir calcliblist detail_help_list \
+	echo_inst_files clean clobber install uninstall
 
 
 ############################################################
@@ -278,6 +286,8 @@ all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
 # additional Makefile targets #
 ###############################
 
+.PHONY: ${PHONY}
+
 # used by the upper level Makefile to determine of we have done all
 #
 # NOTE: Due to bogus shells found on one common system we must have
@@ -287,8 +297,6 @@ all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
 	${RM} -f .all
 	${TOUCH} .all
 
-.PHONY: ${PHONY}
-
 bindings: ../cal/bindings
 	${RM} -f $@
 	${CP} ../cal/bindings $@
@@ -619,6 +627,13 @@ distlist: ${DISTLIST}
 	    fi; \
 	done | fgrep -v '.bak' | LANG=C ${SORT}
 
+buildlist:
+	${Q} for i in ${BUILD_ALL} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo help/$$i; \
+	    fi; \
+	done | fgrep -v '.bak' | LANG=C ${SORT}
+
 distdir:
 	${Q} echo help
 

trailblank

@@ -53,7 +53,7 @@ LEADING_SPACES_BEFORE_TAB=$(
 	      -path './longbits' -o -name '.*.swp' -o -name 'conf.h' -o \
 	      -name '.git' -o -path './custom/libcustcalc*' -o -path './libcustcalc*' -o \
 	      -name 'sample_many-static' -o -name 'sample_rand-static' -o \
-	      -name 'codeql-analysis.yml' -o -name tags -o -name debug.out \
+	      -name 'codeql-analysis.yml' -o -name tags -o -name '*.out' \
 	   \) -prune -o -type f -print0 | \
     xargs -0 egrep -l '^	*  *	'
 )
@@ -84,7 +84,7 @@ TRAILING_WHITESPACE=$(
 	      -path './longbits' -o -name '.*.swp' -o -name 'conf.h' -o \
 	      -name '.git' -o -path './custom/libcustcalc*' -o -path './libcustcalc*' -o \
 	      -name 'sample_many-static' -o -name 'sample_rand-static' -o \
-	      -name 'codeql-analysis.yml' -o -name tags -o -name debug.out \
+	      -name 'codeql-analysis.yml' -o -name tags -o -name '*.out' \
 	   \) -prune -o -type f -print0 | \
     xargs -0 egrep -l '[	 ]$'
 )
@@ -154,7 +154,7 @@ PICKY_PHASE_1=$(
 	      -path './longbits' -o -name '.*.swp' -o -name 'conf.h' -o \
 	      -name '.git' -o -path './custom/libcustcalc*' -o -path './libcustcalc*' -o \
 	      -name 'sample_many-static' -o -name 'sample_rand-static' -o \
-	      -name 'codeql-analysis.yml' -o -name tags -o -name debug.out -o \
+	      -name 'codeql-analysis.yml' -o -name tags -o -name '*.out' -o \
 	      -name '.gitignore' -o -name 'README.md' -o -name '.lldbinit' \
 	   \) -prune -o -type f -print0 | \
     if [[ -x /usr/local/bin/picky ]]; then

update_ver

@@ -180,6 +180,8 @@ fi
 echo
 echo "calc $(./ver_calc) release"
 echo
+echo 'calc-*'$(./ver_calc)'*'
+echo
 echo "Release v$(./ver_calc)"
 
 # All Done!!! -- Jessica Noll, Age 2

version.h

@@ -64,7 +64,7 @@
 #define MAJOR_VER	2	/* level 1: major library version */
 #define MINOR_VER	15	/* level 2: minor library version */
 #define MAJOR_PATCH	0	/* level 3: major software version level */
-#define MINOR_PATCH	0	/* level 4: minor software version level */
+#define MINOR_PATCH	1	/* level 4: minor software version level */
 
 
 #endif /* !INCLUDE_VERSION_H*/