diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-27 11:31:55 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-27 11:35:10 +0100 |
| commit | bdda15e82ea09abdc9ed008edee677a03530cbf3 (patch) | |
| tree | 66672cf0acbc93e31cd5aaee4ae0b1ad8d0ef23f | |
| parent | factor out common code of SmOoxmlExport and SmRtfExport to SmWordExportBase (diff) | |
| download | core-bdda15e82ea09abdc9ed008edee677a03530cbf3.tar.gz core-bdda15e82ea09abdc9ed008edee677a03530cbf3.zip | |
android: get ucpchelp1 conditionals right.
| -rw-r--r-- | sw/CppunitTest_sw_subsequent_odfexport.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_subsequent_ww8export.mk | 3 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_subsequent_ww8import.mk | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 0b9049424e00..21739e79dc98 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -84,7 +84,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ - xmlhelp/util/ucpchelp1 \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport)) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index d46fdfb9ef6e..8c051e354f0e 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -96,8 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - xmlhelp/util/ucpchelp1) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export)) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index cb947e4d9833..cb70e393ce57 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -81,8 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - xmlhelp/util/ucpchelp1) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import)) |