diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-17 23:51:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-18 00:04:15 +0300 |
| commit | 629cc605a45e75d6896b524eada2354c1d4d33a8 (patch) | |
| tree | a9bea5727019feaf545706e5694692c4742c1085 /Repository.mk | |
| parent | 558aa44672fe3565dfe1eab82c8766f2f499ee0d (diff) | |
Intermediate commit of hacking on --disable-database-connectivity
Add HAVE_FEATURE_DBCONNECTIVITY to <config_features.h> instead of
using (or not, more likely) -DDISABLE_DBCONNECTIVITY.
The plan is still that database connectivity would be disabled always
for the non-desktop platforms, and otherwise disabling it would be a
configure option.
But, still lots to do; the TiledLibreOffice iOS test app gets tons of
undefineds when linking if I actually try to disable the database
connectivity.
Change-Id: If1e4b55faa1514cd55dec5fc5487a30d689739ac
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Repository.mk b/Repository.mk index dd1928fb1e9c..3b6f3d9c9ab2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -149,7 +149,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ analysis \ - calc \ + $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ date \ pricing \ sc \ @@ -227,11 +227,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ configmgr \ ctl \ cui \ - dba \ - dbase \ - dbmm \ - $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ - dbaxml \ + $(call gb_Helper_optional,DBCONNECTIVITY, \ + dba \ + dbase \ + dbmm \ + dbtools \ + dbaxml) \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ @@ -253,8 +254,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ evtatt \ exp \ expwrap \ - flat \ - file \ + $(call gb_Helper_optional,DBCONNECTIVITY, \ + flat \ + file) \ filterconfig \ $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \ fps_office \ @@ -300,7 +302,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ msfilter \ $(if $(DISABLE_SCRIPTING),,msforms) \ mtfrenderer \ - mysql \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ odbc \ odfflatxml \ offacc \ @@ -313,7 +315,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ res \ sax \ sb \ - sdbt \ + $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \ scn \ sd \ sdd \ @@ -412,7 +414,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ ) \ communi \ ooxml \ - sdbc \ + $(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \ avmediaQuickTime \ filtertracer \ rpt \ @@ -502,7 +504,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ cached1 \ collator_data \ comphelper \ - dbpool2 \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \ deployment \ deploymentgui \ dict_ja \ |