diff --git a/CHANGES b/CHANGES index 0400892..3c688bb 100644 --- a/CHANGES +++ b/CHANGES @@ -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: diff --git a/Makefile b/Makefile index b5ac9e2..2191696 100644 --- a/Makefile +++ b/Makefile @@ -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 =-=-=-=-=' diff --git a/Makefile.simple b/Makefile.simple index a0e297c..be1d949 100644 --- a/Makefile.simple +++ b/Makefile.simple @@ -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 =-=-=-=-=' diff --git a/custom/Makefile b/custom/Makefile index 3e81608..ccedab2 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -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 diff --git a/custom/Makefile.simple b/custom/Makefile.simple index 65d5069..75f1c96 100644 --- a/custom/Makefile.simple +++ b/custom/Makefile.simple @@ -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