diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-09-28 19:00:01 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-09-28 19:00:01 +0000 |
| commit | 23b3ded0880182d2070bc421c84cd78e4e6fea7e (patch) | |
| tree | a293267d1e2caee02ccf24ddff9df091f6348700 | |
| parent | 3e6d2901abaf9a648a152937d14fc04675eb78d5 (diff) | |
make sure to have parts available when we need them, add a cookie to
depend to be sure. Fixes races in make -j mode.
(tested through full build/release)
okay matthieu@
| -rw-r--r-- | data/xkeyboard-config/rules/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile index 163ba86d1..ab75bf8c9 100644 --- a/data/xkeyboard-config/rules/Makefile +++ b/data/xkeyboard-config/rules/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2012/06/24 17:17:27 matthieu Exp $ +# $OpenBSD: Makefile,v 1.8 2012/09/28 19:00:00 espie Exp $ SUBDIR= compat @@ -44,7 +44,13 @@ BASE_PARTS= base.hdr.part base.lists.part \ BASE_RULES= base base.lst base.xml base.extras.xml -all: depend ${BASE_RULES} _SUBDIRUSE +all: parts_done ${BASE_RULES} _SUBDIRUSE + +parts_done: + cd ${.CURDIR} && exec ${MAKE} depend + touch $@ + +${BASE_PARTS}: parts_done depend: _SUBDIRUSE @@ -68,7 +74,7 @@ install-files: ${BASE_RULES} done clean: _SUBDIRUSE - rm -f ${BASE_RULES} + rm -f ${BASE_RULES} parts_done .include <bsd.xorg.mk> .include <bsd.subdir.mk> |