diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-15 14:46:15 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-15 14:47:43 -0400 |
| commit | a81f161b120de283cf9c5532223a022dbcbeaab7 (patch) | |
| tree | f67e84578c67e535a8aafea5708047e23d50d39d /solenv | |
| parent | 0b2eae62f1ccaad1c963d2637aafaa1ce9062455 (diff) | |
add desktop libs to libmerged
Change-Id: I0e5477f84de316598015330cea995e42f1249acb
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 441263b51338..75dc78ce61e8 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -35,6 +35,7 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ + deploymentgui \ $(call gb_Helper_optional,EXPORT,egi) \ $(call gb_Helper_optional,EXPORT,eme) \ $(call gb_Helper_optional,EXPORT,epb) \ @@ -66,11 +67,14 @@ gb_EXTRAMERGEDLIBS := \ itg \ iti \ $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ + $(call gb_Helper_optional,DESKTOP,migrationoo2) \ + $(call gb_Helper_optional,DESKTOP,migrationoo3) \ $(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 \ + offacc \ oox \ pdffilter \ placeware \ @@ -78,11 +82,13 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ sd \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ + $(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \ svgfilter \ swd \ t602filter \ test \ textfd \ + $(call gb_Helper_optional,DESKTOP,unopkgapp) \ unotest \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ xmlfa \ |