diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-21 14:09:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-21 14:19:50 +0200 |
| commit | 136f53f58e89b13e4d89571fef25b8ba6679e6b4 (patch) | |
| tree | 041ae83ed5d2ef45ccd09c5fb09947073c794993 /sw | |
| parent | f9a5c4cbc275df6dd5a3b31323b1d00343e8e4f0 (diff) | |
More clever way to filter out component files for libs not built
I.e. BASIC stuff for iOS and database connectivity stuff when using
--disable-database-connectivity. All of this quite experimental so
far, using the latter will break your build.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_layout_test.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index a14af327e459..97e6bf3cf42f 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -134,6 +134,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_layout_test,\ $(call gb_CppunitTest_get_target,sw_layout_test) : \ $(call gb_Library_get_target,localedata_en) \ $(call gb_Library_get_target,msword) \ - $(call gb_Library_get_target,vbaswobj) \ + $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \ # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index a2f4c4e29d54..00d092a20ff0 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ $(call gb_CppunitTest_get_target,sw_macros_test) : \ $(call gb_Library_get_target,localedata_en) \ $(call gb_Library_get_target,msword) \ - $(call gb_Library_get_target,vbaswobj) \ + $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \ # vim: set noet sw=4 ts=4: |