Cleanup of Makefiles

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

View File

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