diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-09-23 09:16:34 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-23 15:05:49 +0200 |
| commit | b21b504022babd2de17dfb91e8dc0a2a5c804354 (patch) | |
| tree | b0b1aa273c525ac5386013bfdb8f31e8e76d951a /filter | |
| parent | 3b3c20212e4d50bf70232541fd7e43d516e4db62 (diff) | |
migrate readlicense_oo to gbuild
Change-Id: I8698d2da889d74a9f806c01f520ac0cbcca67b03
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index ed0675a1eeac..05c14fc189d3 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -28,6 +28,7 @@ else # SOLAR_JAVA filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET) endif +filter_MERGE_CONFIG_TARGET := $(OUTDIR_FOR_BUILD)/inc/l10ntools/FCFGMerge.cfg ### filter configuration rules: generic stuff ####################### @@ -37,7 +38,7 @@ filter_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1) filter_XcuFilterTypesTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterTypesTarget/$(1) -$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) +$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -84,7 +85,7 @@ filter_XcuFilterFiltersTarget_get_target = \ filter_XcuFilterFiltersTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterFiltersTarget/$(1) -$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) +$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -117,7 +118,7 @@ filter_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1) filter_XcuFilterOthersTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterOthersTarget/$(1) -$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) +$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -155,7 +156,7 @@ filter_XcuFilterInternalTarget_get_target = \ filter_XcuFilterInternalTarget_get_clean_target = \ $(WORKDIR)/Clean/XcuFilterInternalTarget/$(1) -$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) +$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -201,7 +202,7 @@ filter_XCU_filter := org/openoffice/TypeDetection/Filter.xcu filter_XcuResTarget_get_target = \ $(call gb_XcuResTarget_get_target,fcfg_langpack/$(1)/$(filter_XCU_filter)) -$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) +$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) $(filter_MERGE_CONFIG_TARGET) $(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(true),XCU,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ |