aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules/common.mk13
-rw-r--r--rules/ips-manifest.mk7
2 files changed, 11 insertions, 9 deletions
diff --git a/rules/common.mk b/rules/common.mk
index d130fc0..658ce2d 100644
--- a/rules/common.mk
+++ b/rules/common.mk
@@ -102,15 +102,16 @@ protodir = $(protodir.$(variant))
# Common targets for internal usage.
# Some modules (e. g. 32.mk, autotools.mk) add dependencies
# to this, for example configure with autotools
-check-build-dep-stamp unpack-stamp patch-stamp pre-configure-stamp configure-stamp build-stamp install-stamp:
+check-build-dep-stamp unpack-stamp patch-stamp pre-configure-stamp configure-stamp build-stamp install-stamp post-install-stamp:
touch $@
-install-stamp : build-stamp
-build-stamp : configure-stamp
-configure-stamp : pre-configure-stamp
+post-install-stamp : install-stamp
+install-stamp : build-stamp
+build-stamp : configure-stamp
+configure-stamp : pre-configure-stamp
pre-configure-stamp : patch-stamp unpack-stamp
-patch-stamp : unpack-stamp
-unpack-stamp : check-build-dep-stamp
+patch-stamp : unpack-stamp
+unpack-stamp : check-build-dep-stamp
# Common target to use from command line
# or in component top-level Makefile:
diff --git a/rules/ips-manifest.mk b/rules/ips-manifest.mk
index 8eaa3be..78f3d83 100644
--- a/rules/ips-manifest.mk
+++ b/rules/ips-manifest.mk
@@ -82,6 +82,7 @@ manifests-gen := $(wildcard *.p5m.gen)
ifneq (,$(manifests-gen))
manifests-generated += $(manifests-gen:%.gen=%)
endif
+%.p5m: post-install-stamp
%.p5m: %.p5m.gen
(echo '# This file was generated by "$<"' > "$@" && \
env $(env) "./$<" >> "$@") || rm "$@"
@@ -108,7 +109,7 @@ manifests := $(filter-out $(manifests-generated),$(wildcard *.p5m))
manifests += $(manifests-generated)
-$(manifests-generated): install-stamp
+$(manifests-generated): post-install-stamp
#TODO: Expand "glob" action in manifests:
globalizator := $(cibs-root)/scripts/globalizator
@@ -125,14 +126,14 @@ $(manifestdir)/mogrified-% : $(manifestdir)/glob-%
pkgmogrify $(pkg-define) -I. \
$(transformations) \
$< | \
- sed -e '/^$$/d' -e '/^#.*$$/d' | uniq > $@ || (rm -f $@; false)
+ sed -e '/^$$/d' -e '/^#.*$$/d' | uniq > $@ || (rm -f $@; exit 1)
mogrify-stamp: $(mogrified-manifests)
touch $@
depend-manifests := $(manifests:%=$(manifestdir)/depend-%)
$(manifestdir)/depend-% : $(manifestdir)/mogrified-%
- pkgdepend generate -m $(pkg-protos) $< > $@ || (rm -f $@; false)
+ pkgdepend generate -m $(pkg-protos) $< > $@ || (rm -f $@; exit 1)
depend-stamp: $(depend-manifests)
touch $@
$(depend-manifests): install-stamp