diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-14 18:31:03 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-14 18:50:23 -0400 |
| commit | bd956534b696faec24d2dbf2ca064585099d0704 (patch) | |
| tree | 63583cef4e39388636b0eea3d7fc726143c72bbf /solenv | |
| parent | 1472c5ed16744e1ec918fdb18feaf868dd5a1c47 (diff) | |
add connectivity libs to libmerged
Change-Id: Ia82c3a036ef04e24f7494b6a5a54d01e1b5a58d2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index a0209c8c4422..bf4bd064dc7b 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -29,8 +29,10 @@ ifneq ($(MERGELIBS),) # set of libraries to link even more stuff into one merged library gb_EXTRAMERGEDLIBS := \ $(if $(filter unx,$(GUIBASE)),basebmp) \ + $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ chartcore \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ $(call gb_Helper_optional,EXPORT,egi) \ @@ -44,11 +46,13 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,EXPORT,eti) \ $(call gb_Helper_optional,EXPORT,exp) \ $(call gb_Helper_optional,DBCONNECTIVITY,file) \ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ flash \ for \ forui \ fwl \ graphicfilter \ + $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ icd \ icg \ idx \ @@ -61,6 +65,10 @@ gb_EXTRAMERGEDLIBS := \ ira \ itg \ iti \ + $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mork) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ + $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ odfflatxml \ oox \ @@ -69,6 +77,7 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ sd \ + $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ svgfilter \ swd \ t602filter \ |