Fix a few bugs in threaded dependency generation.

This commit is contained in:
Jonathan Schleifer 2008-02-10 10:40:26 +01:00
parent b3bb041145
commit 036e83942a

View file

@ -94,19 +94,21 @@ depend: pre-depend ${SRCS}
regen=0; \ regen=0; \
test -f .deps || regen=1; \ test -f .deps || regen=1; \
for i in ${SRCS}; do test $$i -nt .deps && regen=1; done; \ for i in ${SRCS}; do test $$i -nt .deps && regen=1; done; \
if test x"$$regen" = x"1"; then \ if test x"$$regen" = x"1" -a x"${DEPS}" != "x"; then \
${DEPEND_STATUS}; \ ${DEPEND_STATUS}; \
rm -f .deps; \ rm -f .deps; \
if ${MAKE} ${MFLAGS} ${DEPS}; then \ if ${MAKE} ${MFLAGS} ${DEPS}; then \
cat ${DEPS} >.deps; \
rm -f ${DEPS}; \
${DEPEND_OK}; \ ${DEPEND_OK}; \
else \ else \
rm -f .deps; \ rm -f .deps ${DEPS}; \
${DEPEND_FAILED}; \ ${DEPEND_FAILED}; \
fi; \ fi; \
fi fi
.c.dep .cc.dep .cxx.dep .m.dep: .c.dep .cc.dep .cxx.dep .m.dep:
${CPP} ${CPPFLAGS} -M $< >>.deps ${CPP} ${CPPFLAGS} -M $< >$@
.d.dep: .d.dep:
@ -352,7 +354,7 @@ clean:
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps; do \ for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps ${DEPS}; do \
if test -f $$i -o -d $$i; then \ if test -f $$i -o -d $$i; then \
if rm -fr $$i; then \ if rm -fr $$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \