Author: vedge
Date: 2008-09-01 23:27:18 -0300 (Mon, 01 Sep 2008)
New Revision: 728
Modified:
trunk/build.lib.mk
trunk/build.prog.mk
Log:
fix dependencies with in-place builds, don't rely on the BSD make behavior
of including .depend by default; reported by smeuuh@
Modified: trunk/build.lib.mk
===================================================================
--- trunk/build.lib.mk 2008-09-02 01:49:57 UTC (rev 727)
+++ trunk/build.lib.mk 2008-09-02 02:27:18 UTC (rev 728)
@@ -333,10 +333,13 @@
echo "rm -f ${CLEANFILES}"; \
rm -f ${CLEANFILES}; \
fi
+ @if [ -e ".depend" ]; then \
+ echo "echo -n >.depend"; \
+ echo -n >.depend; \
+ fi
cleandir-lib:
- rm -f ${LIBTOOL} ${LIBTOOL_COOKIE} ${LTCONFIG_LOG} config.log
- rm -f .depend tags
+ rm -f ${LIBTOOL} ${LIBTOOL_COOKIE} ${LTCONFIG_LOG} config.log tags
if [ -e "./config/prefix.h" ]; then rm -fr ./config; fi
if [ -e "Makefile.config" ]; then echo -n >Makefile.config; fi
@@ -465,3 +468,4 @@
include ${TOP}/mk/build.dep.mk
include ${TOP}/mk/build.proj.mk
include ${TOP}/mk/build.subdir.mk
+include .depend
Modified: trunk/build.prog.mk
===================================================================
--- trunk/build.prog.mk 2008-09-02 01:49:57 UTC (rev 727)
+++ trunk/build.prog.mk 2008-09-02 02:27:18 UTC (rev 728)
@@ -284,9 +284,13 @@
echo "rm -f ${CLEANFILES}"; \
rm -f ${CLEANFILES}; \
fi
+ @if [ -e ".depend" ]; then \
+ echo "echo -n >.depend"; \
+ echo -n >.depend; \
+ fi
cleandir-prog:
- rm -f core *.core config.log .depend tags
+ rm -f *.core config.log tags
if [ -e "./config/prefix.h" ]; then rm -fr ./config; fi
if [ -e "Makefile.config" ]; then echo -n >Makefile.config; fi
@@ -402,3 +406,4 @@
include ${TOP}/mk/build.dep.mk
include ${TOP}/mk/build.proj.mk
include ${TOP}/mk/build.subdir.mk
+include .depend
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
