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

Fix make depend plus make depend Makefile changes

Browse Source
This commit is contained in:
Landon Curt Noll
2021-03-07 02:03:28 -08:00
parent bf4657c138
commit 2085361df1
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.ship
View File

@@ -3876,8 +3876,10 @@ depend: custom/Makefile hsrc
${Q} echo skel formed ${Q} echo skel formed
${Q} echo forming dependency list ${Q} echo forming dependency list
${Q} :> skel/makedep.out ${Q} :> skel/makedep.out
${Q} cd skel; \ ${Q} cd skel; ${MAKEDEPEND} \
${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC} ${BUILD_C_SRC} -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 \ -${Q} for i in ${C_SRC} ${BUILD_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/'; \
@@ -5474,14 +5476,19 @@ have_fpos_pos.o: have_fpos.h
have_fpos_pos.o: have_fpos_pos.c have_fpos_pos.o: have_fpos_pos.c
have_fpos_pos.o: have_posscl.h have_fpos_pos.o: have_posscl.h
have_getpgid.o: have_getpgid.c have_getpgid.o: have_getpgid.c
have_getpgid.o: have_unistd.h
have_getprid.o: have_getprid.c have_getprid.o: have_getprid.c
have_getprid.o: have_unistd.h
have_getsid.o: have_getsid.c have_getsid.o: have_getsid.c
have_getsid.o: have_unistd.h
have_gettime.o: have_gettime.c have_gettime.o: have_gettime.c
have_memmv.o: have_memmv.c have_memmv.o: have_memmv.c
have_newstr.o: have_newstr.c have_newstr.o: have_newstr.c
have_offscl.o: have_offscl.c have_offscl.o: have_offscl.c
have_offscl.o: have_unistd.h
have_posscl.o: have_fpos.h have_posscl.o: have_fpos.h
have_posscl.o: have_posscl.c have_posscl.o: have_posscl.c
have_posscl.o: have_unistd.h
have_rusage.o: have_rusage.c have_rusage.o: have_rusage.c
have_stdvs.o: have_stdlib.h have_stdvs.o: have_stdlib.h
have_stdvs.o: have_stdvs.c have_stdvs.o: have_stdvs.c
@@ -5513,8 +5520,8 @@ help.o: have_stdlib.h
help.o: have_string.h help.o: have_string.h
help.o: have_unistd.h help.o: have_unistd.h
help.o: help.c help.o: help.c
help.o: longbits.h
help.o: lib_calc.h help.o: lib_calc.h
help.o: longbits.h
help.o: nametype.h help.o: nametype.h
help.o: qmath.h help.o: qmath.h
help.o: sha1.h help.o: sha1.h

10
cscript/Makefile
View File

@@ -324,13 +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 'cscript/${MAKE_FILE} was already up to date'; \
echo 'restoring original sample/${MAKE_FILE}'; \ echo 'restoring original cscript/${MAKE_FILE}'; \
${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \ ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
else \ else \
echo 'previous sample/${MAKE_FILE} is now sample/${MAKE_FILE}.bak'; \ echo 'previous cscript/${MAKE_FILE} is now cscript/${MAKE_FILE}.bak'; \
echo 'new sample/${MAKE_FILE} formed'; \ echo 'new cscript/${MAKE_FILE} formed'; \
echo 'try: diff -u sample/${MAKE_FILE}.bak sample/${MAKE_FILE};' \ echo 'try: diff -u cscript/${MAKE_FILE}.bak cscript/${MAKE_FILE}'; \
fi fi
## ##

5
custom/Makefile
View File

@@ -1266,7 +1266,8 @@ depend:
${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} \ ${Q} cd skel/custom; ${MAKEDEPEND} \
-I../../.. -w 1 -f makedep.out \ -I../../.. -w 1 -f makedep.out -- \
${CFLAGS} -- \
${C_SRC} 2>/dev/null ${C_SRC} 2>/dev/null
${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out ${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 \
@@ -1291,7 +1292,7 @@ depend:
else \ else \
echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \ echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
echo 'new custom/${MAKE_FILE} formed'; \ 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 fi
## ##

5
custom/Makefile.tail
View File

@@ -210,7 +210,8 @@ depend:
${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} \ ${Q} cd skel/custom; ${MAKEDEPEND} \
-I../../.. -w 1 -f makedep.out \ -I../../.. -w 1 -f makedep.out -- \
${CFLAGS} -- \
${C_SRC} 2>/dev/null ${C_SRC} 2>/dev/null
${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out ${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 \
@@ -235,7 +236,7 @@ depend:
else \ else \
echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \ echo 'previous custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
echo 'new custom/${MAKE_FILE} formed'; \ 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 fi
## ##