[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Wed Feb 19 22:52:38 CET 2014


 postprocess/CustomTarget_registry.mk |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 76fc71a989b0059c78f4898694e7fa57ebed9248
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Feb 16 00:25:12 2014 +0100

    add missing postprocess deps
    
    - these sometimes break a highly parallel build
    
    Change-Id: Ia30041d2d2ce69900db0476313a0bf2baf6da7a5

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 064228e..9f8d187 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -524,13 +524,16 @@ $(call gb_XcdTarget_get_target,Langpack-$(1).xcd) : \
 	$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \
-	$(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu)
+	$(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu) \
+	| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \
-	$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list
+	$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list \
+	| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \
-	$(call gb_Configuration_get_target,fcfg_langpack)
+	$(call gb_Configuration_get_target,fcfg_langpack) \
+	| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_XcdTarget_get_target,registry_$(1).xcd) : \
 	$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list
@@ -540,7 +543,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \
 	$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
 		$(foreach driver,$(postprocess_DRIVERS),$(call gb_Configuration_get_target,$(driver))) \
 	) \
-	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call gb_Configuration_get_target,updchk))
+	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call gb_Configuration_get_target,updchk)) \
+	| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 endef
 $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(lang))))


More information about the Libreoffice-commits mailing list