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

Fixed make depend on linux

Browse Source
This commit is contained in:
Landon Curt Noll
2021-12-07 04:00:36 -08:00
parent af57104e25
commit 4b2ae40c86
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -1015,3 +1015,4 @@ calc-unsymlink:
${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-=' ${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR} ${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-=' ${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
# DO NOT DELETE

7
Makefile.ship
View File

@@ -1255,7 +1255,7 @@ LANG= C
LDCONFIG= ldconfig LDCONFIG= ldconfig
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= /usr/bin/makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
PWDCMD= pwd PWDCMD= pwd
@@ -4202,6 +4202,11 @@ depend: hsrc custom/Makefile
else \ else \
${TRUE}; \ ${TRUE}; \
fi fi
${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
echo "makedepend command not found: ${MAKEDEPEND}"; \
echo "aborting depend rule"; \
exit 1; \
fi
${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-=' ${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-='
${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend ${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='

13
custom/Makefile
View File

@@ -515,7 +515,7 @@ FMT= fmt
GREP= egrep GREP= egrep
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= /usr/bin/makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
RM= rm RM= rm
@@ -1303,6 +1303,11 @@ depend:
else \ else \
${TRUE}; \ ${TRUE}; \
fi fi
${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
echo "makedepend command not found: ${MAKEDEPEND}"; \
echo "aborting depend rule"; \
exit 1; \
fi
${Q} echo forming custom/skel ${Q} echo forming custom/skel
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
${Q} ${MKDIR} -p skel ${Q} ${MKDIR} -p skel
@@ -1333,7 +1338,7 @@ depend:
>> "skel/$$i"; \ >> "skel/$$i"; \
echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
done done
${Q} ${RM} -f skel/custom/makedep.out ${Q} ${RM} -f skel/custom/makedep.out skel/custom/makedep.in
${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
@@ -1341,7 +1346,9 @@ depend:
-I../../.. -w 1 -f makedep.out -- \ -I../../.. -w 1 -f makedep.out -- \
${CFLAGS} -- \ ${CFLAGS} -- \
${C_SRC} 2>/dev/null ${C_SRC} 2>/dev/null
${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out ${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in
${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \
${GREP} -v /usr/include > 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/'; \

2
custom/Makefile.head
View File

@@ -515,7 +515,7 @@ FMT= fmt
GREP= egrep GREP= egrep
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= /usr/bin/makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
RM= rm RM= rm

11
custom/Makefile.tail
View File

@@ -193,6 +193,11 @@ depend:
else \ else \
${TRUE}; \ ${TRUE}; \
fi fi
${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
echo "makedepend command not found: ${MAKEDEPEND}"; \
echo "aborting depend rule"; \
exit 1; \
fi
${Q} echo forming custom/skel ${Q} echo forming custom/skel
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
${Q} ${MKDIR} -p skel ${Q} ${MKDIR} -p skel
@@ -223,7 +228,7 @@ depend:
>> "skel/$$i"; \ >> "skel/$$i"; \
echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
done done
${Q} ${RM} -f skel/custom/makedep.out ${Q} ${RM} -f skel/custom/makedep.out skel/custom/makedep.in
${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
@@ -231,7 +236,9 @@ depend:
-I../../.. -w 1 -f makedep.out -- \ -I../../.. -w 1 -f makedep.out -- \
${CFLAGS} -- \ ${CFLAGS} -- \
${C_SRC} 2>/dev/null ${C_SRC} 2>/dev/null
${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out ${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in
${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \
${GREP} -v /usr/include > 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/'; \