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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/CppunitTest_sc_cellrangeobj.mk | 3 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 3 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_datapilottableobj.mk | 6 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 530aa9afaf8b..a559777482a4 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -91,8 +91,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\ )) $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\ - $(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ + basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 9b21db085c13..b1e54b02427c 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -90,8 +90,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\ )) $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\ - $(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ + basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 9e06aecf323b..1ac98937f848 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -90,12 +90,10 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilottableobj,\ )) $(eval $(call gb_CppunitTest_add_components,sc_datapilottableobj,\ - $(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ + basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ - $(if $(filter-out $(OS),IOS), \ - dbaccess/util/dba) \ + dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ forms/util/frm \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 8a4a3ccc2840..32f7d47d8aaa 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -87,15 +87,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\ )) $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ - $(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ + basic/util/sb \ chart2/source/controller/chartcontroller \ chart2/source/tools/charttools \ chart2/source/model/chartmodel \ comphelper/util/comphelp \ configmgr/source/configmgr \ - $(if $(filter-out $(OS),IOS), \ - dbaccess/util/dba) \ + dbaccess/util/dba \ eventattacher/source/evtatt \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ |