diff options
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 16 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
3 files changed, 2 insertions, 17 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 184abb9e1527..9aba656ca0d9 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry)) # postprocess_XCS := $(call gb_XcsTarget_get_outdir_target,org/openoffice) -postprocess_XCU := $(call gb_XcuDataTarget_get_outdir_target,org/openoffice) +postprocess_XCU := $(call gb_XcuDataTarget_get_target,officecfg/registry/data/org/openoffice) postprocess_MOD := $(call gb_XcuModuleTarget_get_outdir_target,) postprocess_DRIVERS := diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index e0652e6ea45e..485734134933 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -135,8 +135,7 @@ $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \ $(call gb_XcuDataTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,2) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_XcuDataTarget_get_target,$*) \ - $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE))) + rm -f $(call gb_XcuDataTarget_get_target,$*)) # XcuModuleTarget class @@ -349,21 +348,8 @@ $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \ $(call gb_XcsTarget_for_XcuTarget,$(3)) $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : XCUFILE := $(3) -$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3) -ifeq ($(strip $(gb_Configuration_NODELIVER_$(1))),) -$(call gb_Configuration_get_target,$(1)) : \ - $(call gb_XcuDataTarget_get_outdir_target,$(3)) -$(call gb_XcuDataTarget_get_outdir_target,$(3)) : \ - $(call gb_XcuDataTarget_get_target,$(2)/$(3)) \ - | $(dir $(call gb_XcuDataTarget_get_outdir_target,$(3))).dir -$(call gb_Deliver_add_deliverable,\ - $(call gb_XcuDataTarget_get_outdir_target,$(3)),\ - $(call gb_XcuDataTarget_get_target,$(2)/$(3)),\ - $(2)/$(3)) -else $(call gb_Configuration_get_target,$(1)) : \ $(call gb_XcuDataTarget_get_target,$(2)/$(3)) -endif endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 741706b21b34..58023b1c50fb 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -41,7 +41,6 @@ gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Configuration_registry = $(OUTDIR)/xml/registry gb_XcsTarget_get_outdir_target = \ $(gb_Configuration_registry)/schema$(if $(1),/)$(1) -gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1) gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) gb_Executable_get_target = $(gb_Executable__get_linktarget_target) |