summaryrefslogtreecommitdiff
path: root/reportbuilder
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-10-23 22:26:34 +0200
committerMichael Stahl <mstahl@redhat.com>2012-10-23 22:58:56 +0200
commitcffdb8d6804105bc840a407a10890af556e586c9 (patch)
tree5f13a32ca72c5716795c8b2920c7b80ea1280d7b /reportbuilder
parent4dc53ab0c3b3176ecfe7ea78c131d92a97d2bd14 (diff)
gbuild: fix XcuMergeTarget build breakage:
Introduce gb_XcuFile_for_extension function to use the right file depending on WITH_LANG setting. Change-Id: Ibe4fc4e28fe445fc9391b68d370039528eab7ed8
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/Extension_reportbuilder.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index 7309467dabcd..fd79c8783e6b 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -63,27 +63,27 @@ $(eval $(call gb_Extension_add_files,report-builder,images,\
))
$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
))
$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \
))
$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
))
$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
- $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
+ $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
))
$(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\