From 2085361df1583696093cc8a891f01c7df13c080f Mon Sep 17 00:00:00 2001
From: Landon Curt Noll <github-mail@asthe.com>
Date: Sun, 7 Mar 2021 02:03:28 -0800
Subject: [PATCH] Fix make depend plus make depend Makefile changes

---
 Makefile.ship        | 13 ++++++++++---
 cscript/Makefile     | 10 +++++-----
 custom/Makefile      |  5 +++--
 custom/Makefile.tail |  5 +++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Makefile.ship b/Makefile.ship
index 9d68df9..42f1043 100644
--- a/Makefile.ship
+++ b/Makefile.ship
@@ -3876,8 +3876,10 @@ depend: custom/Makefile hsrc
 	${Q} echo skel formed
 	${Q} echo forming dependency list
 	${Q} :> skel/makedep.out
-	${Q} cd skel; \
-	    ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC} ${BUILD_C_SRC}
+	${Q} cd skel; ${MAKEDEPEND} \
+	    -w 1 -f makedep.out -- \
+	    ${CFLAGS} -- \
+	    ${C_SRC} ${BUILD_C_SRC} 2>/dev/null
 	-${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 	      echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -5474,14 +5476,19 @@ have_fpos_pos.o: have_fpos.h
 have_fpos_pos.o: have_fpos_pos.c
 have_fpos_pos.o: have_posscl.h
 have_getpgid.o: have_getpgid.c
+have_getpgid.o: have_unistd.h
 have_getprid.o: have_getprid.c
+have_getprid.o: have_unistd.h
 have_getsid.o: have_getsid.c
+have_getsid.o: have_unistd.h
 have_gettime.o: have_gettime.c
 have_memmv.o: have_memmv.c
 have_newstr.o: have_newstr.c
 have_offscl.o: have_offscl.c
+have_offscl.o: have_unistd.h
 have_posscl.o: have_fpos.h
 have_posscl.o: have_posscl.c
+have_posscl.o: have_unistd.h
 have_rusage.o: have_rusage.c
 have_stdvs.o: have_stdlib.h
 have_stdvs.o: have_stdvs.c
@@ -5513,8 +5520,8 @@ help.o: have_stdlib.h
 help.o: have_string.h
 help.o: have_unistd.h
 help.o: help.c
-help.o: longbits.h
 help.o: lib_calc.h
+help.o: longbits.h
 help.o: nametype.h
 help.o: qmath.h
 help.o: sha1.h
diff --git a/cscript/Makefile b/cscript/Makefile
index 0d1c732..f180c8c 100644
--- a/cscript/Makefile
+++ b/cscript/Makefile
@@ -324,13 +324,13 @@ depend:
 	${Q} ${CAT} makedep.out >> ${MAKE_FILE}
 	${Q} ${RM} -f makedep.out
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
-	    echo 'sample/${MAKE_FILE} was already up to date'; \
-	    echo 'restoring original sample/${MAKE_FILE}'; \
+	    echo 'cscript/${MAKE_FILE} was already up to date'; \
+	    echo 'restoring original cscript/${MAKE_FILE}'; \
 	    ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
 	else \
-	    echo 'previous sample/${MAKE_FILE} is now sample/${MAKE_FILE}.bak'; \
-	    echo 'new sample/${MAKE_FILE} formed'; \
-	    echo 'try: diff -u sample/${MAKE_FILE}.bak sample/${MAKE_FILE};' \
+	    echo 'previous cscript/${MAKE_FILE} is now cscript/${MAKE_FILE}.bak'; \
+	    echo 'new cscript/${MAKE_FILE} formed'; \
+	    echo 'try: diff -u cscript/${MAKE_FILE}.bak cscript/${MAKE_FILE}'; \
 	fi
 
 ##
diff --git a/custom/Makefile b/custom/Makefile
index 342766a..350d24b 100644
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -1266,7 +1266,8 @@ depend:
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
 	${Q} cd skel/custom; ${MAKEDEPEND} \
-	    -I../../.. -w 1 -f makedep.out \
+	    -I../../.. -w 1 -f makedep.out -- \
+	    ${CFLAGS} -- \
 	    ${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 \
@@ -1291,7 +1292,7 @@ depend:
 	else \
 	    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};' \
+	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE}'; \
 	fi
 
 ##
diff --git a/custom/Makefile.tail b/custom/Makefile.tail
index 27687a7..4d72329 100644
--- a/custom/Makefile.tail
+++ b/custom/Makefile.tail
@@ -210,7 +210,8 @@ depend:
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
 	${Q} cd skel/custom; ${MAKEDEPEND} \
-	    -I../../.. -w 1 -f makedep.out \
+	    -I../../.. -w 1 -f makedep.out -- \
+	    ${CFLAGS} -- \
 	    ${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 \
@@ -235,7 +236,7 @@ depend:
 	else \
 	    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};' \
+	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE}'; \
 	fi
 
 ##