[project @ 2002-07-23 11:25:27 by simonmar]

if $(STAMP_PKG_CONF) is non-null, then wait for it before generating
dependencies.  This avoids a race with 'make -j' where package.conf
could get modified while the compiler is reading it.

diff --git a/mk/target.mk b/mk/target.mk
index ac22224..3a54c97 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -72,7 +72,13 @@ include $(TOP)/mk/package.mk
 # Compiler produced files that are targets of the source's imports.
 MKDEPENDHS_OBJ_SUFFICES=o
 
-depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS)
+ifneq "$(STAMP_PKG_CONF)" ""
+PKGCONF_DEP = $(STAMP_PKG_CONF)
+else
+PKGCONF_DEP =
+endif
+
+depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(STAMP_PKG_CONF)
        @$(RM) .depend
        @touch .depend
 ifneq "$(DOC_SRCS)" ""