solenv/gbuild/CustomTarget.mk | 4 ++-- solenv/gbuild/LinkTarget.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 04e1536d4e77242a47afa5c573add7ab619e6762 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Mon Oct 10 11:13:07 2011 +0200 fixing error handling for generated files again diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 19279a4..20cd29a 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -59,8 +59,8 @@ $(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\ gb_CustomTarget_REPO_$(1) := $(2) $(call gb_CustomTarget_get_target,$(1)) : \ $(call gb_CustomTarget__get_makefile,$($(2)),$(1)) -$(call gb_CustomTarget_get_workdir,$(1))/% : \ - $(call gb_CustomTarget_get_target,$(1)) +$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1)) + test -f $@ || (echo "Missing file $@ which should have been generated from CustomTarget $(1), but was not." && false) endef diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index dea4aaa..49dd076 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -197,7 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c # gb_CObject__command $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%) - $(if $(wildcard $<),,$(eval $(call gb_Output_error,No such source file $<))) + test -f $< || (echo "Missing generated source file $<" && false) $(call gb_CObject__command,$@,$*,$<,$(call gb_GenCObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) @@ -216,7 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx # gb_CxxObject__command $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%) - $(if $(wildcard $<),,$(eval $(call gb_Output_error,No such source file $<))) + test -f $< || (echo "Missing generated source file $<" && false) $(call gb_CxxObject__command,$@,$*,$<,$(call gb_GenCxxObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits