drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of Makefiles

Browse Source 
Fixed Makefile dependenies for the args.h rule.

Fixed Makefile cases where echo with -n is used.  On some systems,
/bin/sh does not use -n, so we must call /bin/echo -n instead
via the ${ECHON} Makefile variable.

Add missing standard tools to sub-Makefiles to make them
easier to invoke directly.

Sort lists of standard tool Makefile variables and remove duplicates.

Declare the SHELL at the top of Makefiles.

Fixed the depend rule in the custom Makefile.
This commit is contained in:
Landon Curt Noll
2021-03-07 01:26:40 -08:00
parent 1b5636afed
commit bf4657c138
8 changed files with 100 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -35,6 +35,8 @@ The following are the changes from calc version 2.12.8.1 to date:
Declare the SHELL at the top of Makefiles. Declare the SHELL at the top of Makefiles.
Fixed the depend rule in the custom Makefile.
The following are the changes from calc version 2.12.7.5 to 2.12.8.0: The following are the changes from calc version 2.12.7.5 to 2.12.8.0:

2
Makefile
View File

@@ -56,7 +56,7 @@
# our shell # our shell
# #
SHELL= /bin/sh SHELL= /bin/zsh
# Try uname -s if the target was not already set on the make command line # Try uname -s if the target was not already set on the make command line
# #

23
Makefile.ship
View File

@@ -1085,6 +1085,7 @@ LANG= C
LDCONFIG= ldconfig LDCONFIG= ldconfig
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
PWDCMD= pwd PWDCMD= pwd
@@ -1094,6 +1095,7 @@ SED= sed
SORT= sort SORT= sort
SPLINT= splint SPLINT= splint
SPLINT_OPTS= SPLINT_OPTS=
STRIP= strip
TEE= tee TEE= tee
TOUCH= touch TOUCH= touch
TRUE= true TRUE= true
@@ -1103,12 +1105,9 @@ XARGS= xargs
# NOTE: On some shells, echo is a builtin that does # NOTE: On some shells, echo is a builtin that does
# not understand -n, so we call /bin/echo -n # not understand -n, so we call /bin/echo -n
# directly to get around such shells. # directly to get around such shells.
#
ECHON= /bin/echo -n ECHON= /bin/echo -n
# assume the X11 makedepend tool for the depend rule
MAKEDEPEND= makedepend
STRIP= strip
# Extra compiling and linking flags # Extra compiling and linking flags
# #
# EXTRA_CFLAGS are flags given to ${CC} when compiling C files # EXTRA_CFLAGS are flags given to ${CC} when compiling C files
@@ -2062,6 +2061,7 @@ CSCRIPT_PASSDOWN= \
CMP=${CMP} \ CMP=${CMP} \
CO=${CO} \ CO=${CO} \
CP=${CP} \ CP=${CP} \
ECHON="${ECHON}" \
FMT=${FMT} \ FMT=${FMT} \
HELPDIR="${HELPDIR}" \ HELPDIR="${HELPDIR}" \
INCDIR="${INCDIR}" \ INCDIR="${INCDIR}" \
@@ -3894,19 +3894,12 @@ depend: custom/Makefile hsrc
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \ -${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
echo 'top level ${MAKE_FILE} was already up to date'; \ echo 'top level ${MAKE_FILE} was already up to date'; \
echo 'restoring original ${MAKE_FILE};' \
${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \ ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
else \ else \
${RM} -f ${MAKE_FILE}.tmp; \ echo 'previous ${MAKE_FILE} is now ${MAKE_FILE}.bak'; \
${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \ echo 'new top level ${MAKE_FILE} formed'; \
if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \ echo 'try: diff -u ${MAKE_FILE}.bak ${MAKE_FILE}'; \
${CO} -l ${MAKE_FILE}; \
fi ;\
${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
if [ -d RCS ]; then \
echo '********************************************************'; \
echo 'new top level ${MAKE_FILE} formed -- need to check it in'; \
echo '********************************************************'; \
fi; \
fi fi
# generate the list of h files for lower level depend use # generate the list of h files for lower level depend use

49
cal/Makefile
View File

@@ -188,25 +188,24 @@ TRUE= true
# #
# make calc_files_list # make calc_files_list
# #
# to keep this list in nice sorted order and to check that these # to keep this list in nice sorted order.
# detailed help files are under RCS control.
# #
CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \ CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal chrem.cal \ bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal chrem.cal \
constants.cal deg.cal dms.cal dotest.cal ellip.cal factorial.cal \ constants.cal deg.cal dms.cal dotest.cal ellip.cal factorial.cal \
factorial2.cal gvec.cal hello.cal hms.cal infinities.cal \ factorial2.cal gvec.cal hello.cal hms.cal infinities.cal intfile.cal \
intfile.cal intnum.cal lambertw.cal linear.cal lnseries.cal \ intnum.cal lambertw.cal linear.cal lnseries.cal lucas.cal \
lucas.cal lucas_chk.cal mersenne.cal mfactor.cal \ lucas_chk.cal mersenne.cal mfactor.cal mod.cal natnumset.cal pell.cal \
mod.cal natnumset.cal pell.cal pi.cal pix.cal pollard.cal poly.cal \ pi.cal pix.cal pollard.cal poly.cal prompt.cal psqrt.cal qtime.cal \
prompt.cal psqrt.cal qtime.cal quat.cal randbitrun.cal randmprime.cal \ quat.cal randbitrun.cal randmprime.cal randombitrun.cal randomrun.cal \
randombitrun.cal randomrun.cal randrun.cal regress.cal repeat.cal \ randrun.cal regress.cal repeat.cal screen.cal seedrandom.cal \
screen.cal seedrandom.cal set8700.cal set8700.line smallfactors.cal \ set8700.cal set8700.line smallfactors.cal solve.cal \
solve.cal specialfunctions.cal statistics.cal strings.cal sumsq.cal \ specialfunctions.cal statistics.cal strings.cal sumsq.cal sumtimes.cal \
sumtimes.cal surd.cal test1700.cal test2300.cal test2600.cal \ surd.cal test1700.cal test2300.cal test2600.cal test2700.cal \
test2700.cal test3100.cal test3300.cal test3400.cal test3500.cal \ test3100.cal test3300.cal test3400.cal test3500.cal test4000.cal \
test4000.cal test4100.cal test4600.cal test5100.cal test5200.cal \ test4100.cal test4600.cal test5100.cal test5200.cal test8400.cal \
test8400.cal test8500.cal test8600.cal test8900.cal toomcook.cal \ test8500.cal test8600.cal test8900.cal toomcook.cal unitfrac.cal \
unitfrac.cal varargs.cal xx_print.cal zeta2.cal varargs.cal xx_print.cal zeta2.cal
# These calc files are now obsolete and are removed by the install rule. # These calc files are now obsolete and are removed by the install rule.
# #
@@ -262,19 +261,13 @@ calcliblist:
# #
calc_files_list: calc_files_list:
${Q} -(find . -mindepth 1 -maxdepth 1 -type f -name '*.cal' -print | \ ${Q} -(find . -mindepth 1 -maxdepth 1 -type f -name '*.cal' -print | \
while read i; do \ while read i; do \
if [ X"$$i" != X"/dev/null" ]; then \ echo $$i; \
if [ ! -f RCS/$$i,v ]; then \ done; \
echo "WARNING: $$i not under RCS control" 1>&2; \ echo '--first_line--'; \
else \ echo README; \
echo $$i; \ echo set8700.line; \
fi; \ echo bindings) | \
fi; \
done; \
echo '--first_line--'; \
echo README; \
echo set8700.line; \
echo bindings) | \
${SED} -e 's:^\./::' | LANG=C ${SORT} | ${FMT} -70 | \ ${SED} -e 's:^\./::' | LANG=C ${SORT} | ${FMT} -70 | \
${SED} -e '1s/--first_line--/CALC_FILES=/' -e '2,$$s/^/ /' \ ${SED} -e '1s/--first_line--/CALC_FILES=/' -e '2,$$s/^/ /' \
-e 's/$$/ \\/' -e '$$s/ \\$$//' -e 's/$$/ \\/' -e '$$s/ \\$$//'

46
cscript/Makefile
View File

@@ -183,6 +183,7 @@ TRUE= true
# NOTE: On some shells, echo is a builtin that does # NOTE: On some shells, echo is a builtin that does
# not understand -n, so we call /bin/echo -n # not understand -n, so we call /bin/echo -n
# directly to get around such shells. # directly to get around such shells.
#
ECHON= /bin/echo -n ECHON= /bin/echo -n
# The ${SCRIPT} list is the list of calc shell script files (without the .calc # The ${SCRIPT} list is the list of calc shell script files (without the .calc
@@ -194,19 +195,17 @@ ECHON= /bin/echo -n
# To add a script: # To add a script:
# #
# 1) Name the file with a .calc filename extension # 1) Name the file with a .calc filename extension
# 2) Place that file under RCS control # 2) Add the name, without the .calc extension to the ${SCRIPT} below
# 3) Add the name, without the .calc extension to the ${SCRIPT} below # 3) Write out this Makefile
# 4) Write out this Makefile # 4) Replace the SCRIPT= and SCRIPT_SRC= lines with the output of:
# 5) Replace the ${SCRIPT} and ${SCRIPT_SRC} lines with the output of:
# #
# make detaillist # make detaillist
# #
SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \ SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm simple \
simple square square
SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \ SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc piforever.calc \
piforever.calc plus.calc powerterm.calc simple.calc \ plus.calc powerterm.calc simple.calc square.calc
square.calc
# These files are found (but not built) in the distribution # These files are found (but not built) in the distribution
# #
@@ -270,11 +269,7 @@ detaillist:
${Q} -(echo "xxxxxxx"; \ ${Q} -(echo "xxxxxxx"; \
for i in ${SCRIPT} /dev/null; do \ for i in ${SCRIPT} /dev/null; do \
if [ X"$$i" != X"/dev/null" ]; then \ if [ X"$$i" != X"/dev/null" ]; then \
if [ ! -f RCS/$$i.calc,v ]; then \ echo $$i; \
echo "WARNING: $$i.calc not under RCS control" 1>&2; \
else \
echo $$i; \
fi; \
fi; \ fi; \
done | LANG=C ${SORT}) | ${FMT} -70 | \ done | LANG=C ${SORT}) | ${FMT} -70 | \
${SED} -e '1s/xxxxxxx/SCRIPT=/' -e '2,$$s/^/ /' \ ${SED} -e '1s/xxxxxxx/SCRIPT=/' -e '2,$$s/^/ /' \
@@ -283,11 +278,7 @@ detaillist:
${Q} -(echo "xxxxxxxxxxx"; \ ${Q} -(echo "xxxxxxxxxxx"; \
for i in ${SCRIPT} /dev/null; do \ for i in ${SCRIPT} /dev/null; do \
if [ X"$$i" != X"/dev/null" ]; then \ if [ X"$$i" != X"/dev/null" ]; then \
if [ ! -f RCS/$$i.calc,v ]; then \ echo $$i.calc; \
echo "WARNING: $$i.calc not under RCS control" 1>&2; \
else \
echo $$i.calc; \
fi; \
fi; \ fi; \
done | LANG=C ${SORT}) | ${FMT} -70 | \ done | LANG=C ${SORT}) | ${FMT} -70 | \
${SED} -e '1s/xxxxxxxxxxx/SCRIPT_SRC=/' -e '2,$$s/^/ /' \ ${SED} -e '1s/xxxxxxxxxxx/SCRIPT_SRC=/' -e '2,$$s/^/ /' \
@@ -333,20 +324,13 @@ depend:
${Q} ${CAT} makedep.out >> ${MAKE_FILE} ${Q} ${CAT} makedep.out >> ${MAKE_FILE}
${Q} ${RM} -f makedep.out ${Q} ${RM} -f makedep.out
-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \ -${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
echo 'sample ${MAKE_FILE} was already up to date'; \ echo 'sample/${MAKE_FILE} was already up to date'; \
echo 'restoring original sample/${MAKE_FILE}'; \
${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \ ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
else \ else \
${RM} -f ${MAKE_FILE}.tmp; \ echo 'previous sample/${MAKE_FILE} is now sample/${MAKE_FILE}.bak'; \
${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \ echo 'new sample/${MAKE_FILE} formed'; \
if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \ echo 'try: diff -u sample/${MAKE_FILE}.bak sample/${MAKE_FILE};' \
${CO} -l ${MAKE_FILE}; \
fi; \
${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
if [ -d RCS ]; then \
echo '******************************************************'; \
echo 'new cscript ${MAKE_FILE} formed -- need to check it in'; \
echo '******************************************************'; \
fi; \
fi fi
## ##

52
custom/Makefile
View File

@@ -1226,7 +1226,7 @@ Makefile.simple: ${MAKE_FILE}
depend: depend:
${Q} if [ -f ${MAKE_FILE}.bak ]; then \ ${Q} if [ -f ${MAKE_FILE}.bak ]; then \
echo "${MAKE_FILE}.bak exists, remove or move it"; \ echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
exit 1; \ exit 1; \
else \ else \
${TRUE}; \ ${TRUE}; \
@@ -1242,9 +1242,7 @@ depend:
fi; \ fi; \
done done
-${Q} for i in ${H_SRC} /dev/null; do \ -${Q} for i in ${H_SRC} /dev/null; do \
if [ "$$i" = "/dev/null" ]; then \ if [ "$$i" = "/dev/null" ]; then continue; fi; \
continue; \
fi; \
tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \ tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
echo "#if !defined($$tag)" > "skel/custom/$$i"; \ echo "#if !defined($$tag)" > "skel/custom/$$i"; \
echo "#define $$tag" >> "skel/custom/$$i"; \ echo "#define $$tag" >> "skel/custom/$$i"; \
@@ -1253,25 +1251,24 @@ depend:
echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
done done
${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc) ${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
${Q} for i in `cd ..; ${MAKE} -f ${TOP_MAKE_FILE} h_list 2>&1 | \ ${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
${SED} -e '/Entering directory/d' \ while read i; do \
-e '/Nothing to be done/d' \ if [ ! -f "../$$i" ]; then continue; fi; \
-e '/Leaving directory/d'` /dev/null; do \ tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
if [ "$$i" = "/dev/null" ]; then \ echo "#if !defined($$tag)" > "skel/$$i"; \
continue; \ echo "#define $$tag" >> "skel/$$i"; \
fi; \ ${SED} -n '/^#[ ]*include[ ]*"/p' "../$$i" \
tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \ >> "skel/$$i"; \
echo "#if !defined($$tag)" > "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
echo "#define $$tag" >> "skel/$$i"; \ done
${SED} -n '/^#[ ]*include[ ]*"/p' "../$$i" \
>> "skel/$$i"; \
echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
done
${Q} ${RM} -f skel/custom/makedep.out ${Q} ${RM} -f skel/custom/makedep.out
${Q} echo custom/skel formed ${Q} echo custom/skel formed
${Q} echo forming custom dependency list ${Q} echo forming custom dependency list
${Q} :> skel/custom/makedep.out ${Q} :> skel/custom/makedep.out
${Q} cd skel/custom; ${MAKEDEPEND} -I.. -w 1 -f makedep.out ${C_SRC} ${Q} cd skel/custom; ${MAKEDEPEND} \
-I../../.. -w 1 -f makedep.out \
${C_SRC} 2>/dev/null
${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
-${Q} for i in ${C_SRC} /dev/null; do \ -${Q} for i in ${C_SRC} /dev/null; do \
if [ X"$$i" != X"/dev/null" ]; then \ if [ X"$$i" != X"/dev/null" ]; then \
echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \ echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -1288,20 +1285,13 @@ depend:
${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE} ${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \ -${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
echo 'custom ${MAKE_FILE} was already up to date'; \ echo 'custom/${MAKE_FILE} was already up to date'; \
echo 'restoring original custom/${MAKE_FILE}'; \
${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \ ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
else \ else \
${RM} -f ${MAKE_FILE}.tmp; \ echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \ echo 'new custom/${MAKE_FILE} formed'; \
if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \ echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE};' \
${CO} -l ${MAKE_FILE}; \
fi ;\
${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
if [ -d RCS ]; then \
echo '****************************************************'; \
echo 'new custom ${MAKE_FILE} formed -- you to check it in'; \
echo '****************************************************'; \
fi; \
fi fi
## ##

52
custom/Makefile.tail
View File

@@ -170,7 +170,7 @@ Makefile.simple: ${MAKE_FILE}
depend: depend:
${Q} if [ -f ${MAKE_FILE}.bak ]; then \ ${Q} if [ -f ${MAKE_FILE}.bak ]; then \
echo "${MAKE_FILE}.bak exists, remove or move it"; \ echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
exit 1; \ exit 1; \
else \ else \
${TRUE}; \ ${TRUE}; \
@@ -186,9 +186,7 @@ depend:
fi; \ fi; \
done done
-${Q} for i in ${H_SRC} /dev/null; do \ -${Q} for i in ${H_SRC} /dev/null; do \
if [ "$$i" = "/dev/null" ]; then \ if [ "$$i" = "/dev/null" ]; then continue; fi; \
continue; \
fi; \
tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \ tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
echo "#if !defined($$tag)" > "skel/custom/$$i"; \ echo "#if !defined($$tag)" > "skel/custom/$$i"; \
echo "#define $$tag" >> "skel/custom/$$i"; \ echo "#define $$tag" >> "skel/custom/$$i"; \
@@ -197,25 +195,24 @@ depend:
echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
done done
${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc) ${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
${Q} for i in `cd ..; ${MAKE} -f ${TOP_MAKE_FILE} h_list 2>&1 | \ ${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
${SED} -e '/Entering directory/d' \ while read i; do \
-e '/Nothing to be done/d' \ if [ ! -f "../$$i" ]; then continue; fi; \
-e '/Leaving directory/d'` /dev/null; do \ tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
if [ "$$i" = "/dev/null" ]; then \ echo "#if !defined($$tag)" > "skel/$$i"; \
continue; \ echo "#define $$tag" >> "skel/$$i"; \
fi; \ ${SED} -n '/^#[ ]*include[ ]*"/p' "../$$i" \
tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \ >> "skel/$$i"; \
echo "#if !defined($$tag)" > "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
echo "#define $$tag" >> "skel/$$i"; \ done
${SED} -n '/^#[ ]*include[ ]*"/p' "../$$i" \
>> "skel/$$i"; \
echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
done
${Q} ${RM} -f skel/custom/makedep.out ${Q} ${RM} -f skel/custom/makedep.out
${Q} echo custom/skel formed ${Q} echo custom/skel formed
${Q} echo forming custom dependency list ${Q} echo forming custom dependency list
${Q} :> skel/custom/makedep.out ${Q} :> skel/custom/makedep.out
${Q} cd skel/custom; ${MAKEDEPEND} -I.. -w 1 -f makedep.out ${C_SRC} ${Q} cd skel/custom; ${MAKEDEPEND} \
-I../../.. -w 1 -f makedep.out \
${C_SRC} 2>/dev/null
${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
-${Q} for i in ${C_SRC} /dev/null; do \ -${Q} for i in ${C_SRC} /dev/null; do \
if [ X"$$i" != X"/dev/null" ]; then \ if [ X"$$i" != X"/dev/null" ]; then \
echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \ echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -232,20 +229,13 @@ depend:
${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE} ${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \ -${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
echo 'custom ${MAKE_FILE} was already up to date'; \ echo 'custom/${MAKE_FILE} was already up to date'; \
echo 'restoring original custom/${MAKE_FILE}'; \
${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \ ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
else \ else \
${RM} -f ${MAKE_FILE}.tmp; \ echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \ echo 'new custom/${MAKE_FILE} formed'; \
if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \ echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE};' \
${CO} -l ${MAKE_FILE}; \
fi ;\
${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
if [ -d RCS ]; then \
echo '****************************************************'; \
echo 'new custom ${MAKE_FILE} formed -- you to check it in'; \
echo '****************************************************'; \
fi; \
fi fi
## ##

26
help/Makefile
View File

@@ -277,8 +277,7 @@ BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \
# #
# make detail_help_list # make detail_help_list
# #
# to keep this list in nice sorted order and to check that these # to keep this list in nice sorted order.
# non-special help files are under RCS control.
# #
DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd \ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd \
append appr arg argv arrow asec asech asin asinh assign atan atan2 \ append appr arg argv arrow asec asech asin asinh assign atan atan2 \
@@ -301,14 +300,15 @@ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd \
matsum mattrace mattrans max memsize meq min minv mmin mne mod modify \ matsum mattrace mattrans max memsize meq min minv mmin mne mod modify \
name near newerror nextcand nextprime norm null num oldvalue ord param \ name near newerror nextcand nextprime norm null num oldvalue ord param \
perm pfact pi pix places pmod polar poly pop popcnt pound power \ perm pfact pi pix places pmod polar poly pop popcnt pound power \
prevcand prevprime printf prompt protect ptest push putenv quo quomod \ prevcand prevprime printf prompt protect ptest push putenv questions \
rand randbit random randombit randperm rcin rcmul rcout rcpow rcsq re \ quo quomod rand randbit random randombit randperm rcin rcmul rcout \
remove reverse rewind rm root round rsearch runtime saveval scale scan \ rcpow rcsq re remove reverse rewind rm root round rsearch runtime \
scanf search sec sech seed segment select sgn sha1 sin sinh size \ saveval scale scan scanf search sec sech seed segment select sgn sha1 \
sizeof sleep sort sqrt srand srandom ssq stoponerror str strcasecmp \ sin sinh size sizeof sleep sort sqrt srand srandom ssq stoponerror str \
strcat strcmp strcpy strerror strlen strncasecmp strncmp strncpy \ strcasecmp strcat strcmp strcpy strerror strlen strncasecmp strncmp \
strpos strprintf strscan strscanf strtolower strtoupper substr sum \ strncpy strpos strprintf strscan strscanf strtolower strtoupper substr \
swap system systime tail tan tanh test time trunc usertime version xor sum swap system systime tail tan tanh test time trunc usertime version \
xor
# This list is of files that are clones of DETAIL_HELP files. They are # This list is of files that are clones of DETAIL_HELP files. They are
# built from DETAIL_HELP files. # built from DETAIL_HELP files.
@@ -690,11 +690,7 @@ detail_help_list:
-print | \ -print | \
while read i; do \ while read i; do \
if [ X"$$i" != X"/dev/null" ]; then \ if [ X"$$i" != X"/dev/null" ]; then \
if [ ! -f RCS/$$i,v ]; then \ echo $$i; \
echo "WARNING: $$i not under RCS control" 1>&2; \
else \
echo $$i; \
fi; \
fi; \ fi; \
done; \ done; \
echo '--first_line--') | \ echo '--first_line--') | \