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.
2025-08-16 01:03:29 +03:00 · 2021-03-07 01:26:40 -08:00
parent 1b5636afed
commit bf4657c138
8 changed files with 100 additions and 152 deletions
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -1226,7 +1226,7 @@ Makefile.simple: ${MAKE_FILE}

 depend:
 	${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; \
 	else \
 	    ${TRUE}; \
@@ -1242,9 +1242,7 @@ depend:
 	    fi; \
 	done
 	-${Q} for i in ${H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
+	    if [ "$$i" = "/dev/null" ]; then continue; fi; \
 	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
 	    echo "#define $$tag" >> "skel/custom/$$i"; \
@@ -1253,25 +1251,24 @@ depend:
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${Q} for i in `cd ..; ${MAKE} -f ${TOP_MAKE_FILE} h_list 2>&1 | \
-	    ${SED} -e '/Entering directory/d' \
-		   -e '/Nothing to be done/d' \
-		   -e '/Leaving directory/d'` /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-	    echo "#if !defined($$tag)" > "skel/$$i"; \
-	    echo "#define $$tag" >> "skel/$$i"; \
-	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		>> "skel/$$i"; \
-	    echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	done
+	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
+	    while read i; do \
+		if [ ! -f "../$$i" ]; then continue; fi; \
+		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+		echo "#if !defined($$tag)" > "skel/$$i"; \
+		echo "#define $$tag" >> "skel/$$i"; \
+		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
+		    >> "skel/$$i"; \
+		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
+	    done
 	${Q} ${RM} -f skel/custom/makedep.out
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${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 \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -1288,20 +1285,13 @@ depend:
 	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
 	${Q} ${RM} -rf skel
 	-${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}; \
 	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 custom ${MAKE_FILE} formed -- you to check it in'; \
-	    echo '****************************************************'; \
-	    fi; \
+	    echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
+	    echo 'new custom/${MAKE_FILE} formed'; \
+	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE};' \
 	fi

 ##
--- a/custom/Makefile.tail
+++ b/custom/Makefile.tail
@@ -170,7 +170,7 @@ Makefile.simple: ${MAKE_FILE}

 depend:
 	${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; \
 	else \
 	    ${TRUE}; \
@@ -186,9 +186,7 @@ depend:
 	    fi; \
 	done
 	-${Q} for i in ${H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
+	    if [ "$$i" = "/dev/null" ]; then continue; fi; \
 	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
 	    echo "#define $$tag" >> "skel/custom/$$i"; \
@@ -197,25 +195,24 @@ depend:
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${Q} for i in `cd ..; ${MAKE} -f ${TOP_MAKE_FILE} h_list 2>&1 | \
-	    ${SED} -e '/Entering directory/d' \
-		   -e '/Nothing to be done/d' \
-		   -e '/Leaving directory/d'` /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-	    echo "#if !defined($$tag)" > "skel/$$i"; \
-	    echo "#define $$tag" >> "skel/$$i"; \
-	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		>> "skel/$$i"; \
-	    echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	done
+	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
+	    while read i; do \
+		if [ ! -f "../$$i" ]; then continue; fi; \
+		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+		echo "#if !defined($$tag)" > "skel/$$i"; \
+		echo "#define $$tag" >> "skel/$$i"; \
+		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
+		    >> "skel/$$i"; \
+		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
+	    done
 	${Q} ${RM} -f skel/custom/makedep.out
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${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 \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -232,20 +229,13 @@ depend:
 	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
 	${Q} ${RM} -rf skel
 	-${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}; \
 	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 custom ${MAKE_FILE} formed -- you to check it in'; \
-	    echo '****************************************************'; \
-	    fi; \
+	    echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
+	    echo 'new custom/${MAKE_FILE} formed'; \
+	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE};' \
 	fi

 ##