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

Browse Source
This commit is contained in:
Landon Curt Noll
2023-03-06 03:39:40 -08:00
parent d5a11b3df4
commit 8ef7b5311e
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -74,6 +74,9 @@ The following are the changes from calc version 2.14.2.3 to date:
The pseudo_seed() function will also try to call statfs() if
possible and permitted by the HAVE_STATFS value.
Test if makedepend command is available before trying to build
the Makefile dependency list via "make depend".
The following are the changes from calc version 2.14.2.0 to 2.14.1.2:

6
Makefile
View File

@@ -4675,6 +4675,12 @@ depend: hsrc custom/Makefile
else \
${TRUE}; \
fi
${Q} if type -f ${MAKEDEPEND}; then \
${TRUE}; \
else \
echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
exit 1; \
fi
${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-='
${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='

6
Makefile.simple
View File

@@ -3985,6 +3985,12 @@ depend: hsrc custom/Makefile
else \
${TRUE}; \
fi
${Q} if type -f ${MAKEDEPEND}; then \
${TRUE}; \
else \
echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
exit 1; \
fi
${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-='
${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='

12
custom/Makefile
View File

@@ -802,11 +802,17 @@ Makefile.simple: Makefile ../Makefile
depend:
${Q} if [ -f ${MAKE_FILE}.bak ]; then \
echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
echo "custom/${MAKE_FILE}.bak exists, remove or move it" 1>&2; \
exit 1; \
else \
${TRUE}; \
fi
${Q} if type -f ${MAKEDEPEND}; then \
${TRUE}; \
else \
echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
exit 1; \
fi
${Q} echo forming custom/skel
${Q} ${RM} -rf skel
${Q} ${MKDIR} -p skel
@@ -827,7 +833,7 @@ depend:
echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
done
${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
${MAKE} -f ../${MAKE_FILE} h_list 2>/dev/null | \
(cd ..; ${MAKE} -f ${MAKE_FILE} h_list 2>/dev/null) | \
while read i; do \
if [ ! -f "../$$i" ]; then continue; fi; \
tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -841,7 +847,7 @@ depend:
${Q} echo custom/skel formed
${Q} echo forming custom dependency list
${Q} :> skel/custom/makedep.out
${Q} cd skel/custom; ${MAKEDEPEND} \
-${Q} cd skel/custom; ${MAKEDEPEND} \
-I../../.. -w 1 -f makedep.out -- \
${CFLAGS} -- \
${C_SRC} 2>/dev/null

12
custom/Makefile.simple
View File

@@ -806,11 +806,17 @@ calcliblist: ${CALCLIBLIST}
depend:
${Q} if [ -f ${MAKE_FILE}.bak ]; then \
echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
echo "custom/${MAKE_FILE}.bak exists, remove or move it" 1>&2; \
exit 1; \
else \
${TRUE}; \
fi
${Q} if type -f ${MAKEDEPEND}; then \
${TRUE}; \
else \
echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
exit 1; \
fi
${Q} echo forming custom/skel
${Q} ${RM} -rf skel
${Q} ${MKDIR} -p skel
@@ -831,7 +837,7 @@ depend:
echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
done
${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
${MAKE} -f ../${MAKE_FILE} h_list 2>/dev/null | \
(cd ..; ${MAKE} -f ${MAKE_FILE} h_list 2>/dev/null) | \
while read i; do \
if [ ! -f "../$$i" ]; then continue; fi; \
tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -845,7 +851,7 @@ depend:
${Q} echo custom/skel formed
${Q} echo forming custom dependency list
${Q} :> skel/custom/makedep.out
${Q} cd skel/custom; ${MAKEDEPEND} \
-${Q} cd skel/custom; ${MAKEDEPEND} \
-I../../.. -w 1 -f makedep.out -- \
${CFLAGS} -- \
${C_SRC} 2>/dev/null